Skip to content

Commit 3d47875

Browse files
aschackmullaschackmull
committed
Dataflow: Generate shorter RA/DIL names.
1 parent d3dcc3c commit 3d47875

File tree

31 files changed

+186
-62
lines changed

31 files changed

+186
-62
lines changed

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,9 @@ private module Stage2Param implements MkStage<Stage1>::StageParam {
19361936
predicate typecheckStore(Ap ap, DataFlowType contentType) { any() }
19371937
}
19381938

1939-
private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
1939+
private module Stage2 implements StageSig {
1940+
import MkStage<Stage1>::Stage<Stage2Param>
1941+
}
19401942

19411943
pragma[nomagic]
19421944
private predicate flowOutOfCallNodeCand2(
@@ -2210,7 +2212,9 @@ private module Stage3Param implements MkStage<Stage2>::StageParam {
22102212
}
22112213
}
22122214

2213-
private module Stage3 = MkStage<Stage2>::Stage<Stage3Param>;
2215+
private module Stage3 implements StageSig {
2216+
import MkStage<Stage2>::Stage<Stage3Param>
2217+
}
22142218

22152219
/**
22162220
* Holds if `argApf` is recorded as the summary context for flow reaching `node`

0 commit comments

Comments
 (0)