Skip to content

Commit b08e347

Browse files
committed
C++: Accept test changes.
1 parent 6915e81 commit b08e347

File tree

2 files changed

+376
-154
lines changed

2 files changed

+376
-154
lines changed

cpp/ql/test/library-tests/ir/ir/aliased_ir.expected

Lines changed: 189 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -20755,90 +20755,201 @@ ir.cpp:
2075520755
# 2830| m2830_10(unsigned int) = InitializeParameter[u] : &:r2830_9
2075620756
# 2830| r2830_11(glval<int>) = VariableAddress[shadowed] :
2075720757
# 2830| m2830_12(int) = InitializeParameter[shadowed] : &:r2830_11
20758-
# 2831| r2831_1(int) = Constant[0] :
20759-
# 2831| v2831_2(void) = Convert : r2831_1
20760-
# 2832| r2832_1(int) = Constant[0] :
20761-
# 2832| v2832_2(void) = Convert : r2832_1
20762-
# 2833| r2833_1(int) = Constant[0] :
20763-
# 2833| v2833_2(void) = Convert : r2833_1
20764-
# 2835| v2835_1(void) = NoOp :
20765-
# 2837| r2837_1(int) = Constant[0] :
20766-
# 2837| v2837_2(void) = Convert : r2837_1
20767-
# 2840| r2840_1(glval<int>) = VariableAddress[shadowed] :
20768-
# 2840| r2840_2(glval<int>) = VariableAddress[x] :
20769-
# 2840| r2840_3(int) = Load[x] : &:r2840_2, m2830_6
20770-
# 2840| m2840_4(int) = Store[shadowed] : &:r2840_1, r2840_3
20771-
# 2841| r2841_1(int) = Constant[0] :
20772-
# 2841| v2841_2(void) = Convert : r2841_1
20773-
# 2843| v2843_1(void) = NoOp :
20774-
# 2830| v2830_13(void) = ReturnVoid :
20775-
# 2830| v2830_14(void) = AliasedUse : m2830_3
20776-
# 2830| v2830_15(void) = ExitFunction :
20758+
# 2831| r2831_1(glval<int>) = VariableAddress[x] :
20759+
# 2831| r2831_2(int) = Load[x] : &:r2831_1, m2830_6
20760+
# 2831| r2831_3(int) = Constant[0] :
20761+
# 2831| r2831_4(bool) = CompareGT : r2831_2, r2831_3
20762+
# 2831| v2831_5(void) = ConditionalBranch : r2831_4
20763+
#-----| True -> Block 1
20764+
20765+
# 2832| Block 1
20766+
# 2832| r2832_1(int) = Constant[0] :
20767+
# 2832| r2832_2(glval<int>) = VariableAddress[x] :
20768+
# 2832| r2832_3(int) = Load[x] : &:r2832_2, m2830_6
20769+
# 2832| r2832_4(bool) = CompareLT : r2832_1, r2832_3
20770+
# 2832| v2832_5(void) = ConditionalBranch : r2832_4
20771+
#-----| True -> Block 2
20772+
20773+
# 2833| Block 2
20774+
# 2833| r2833_1(glval<int>) = VariableAddress[x] :
20775+
# 2833| r2833_2(int) = Load[x] : &:r2833_1, m2830_6
20776+
# 2833| r2833_3(glval<int>) = VariableAddress[y] :
20777+
# 2833| r2833_4(int) = Load[y] : &:r2833_3, m2830_8
20778+
# 2833| r2833_5(bool) = CompareLT : r2833_2, r2833_4
20779+
# 2833| v2833_6(void) = ConditionalBranch : r2833_5
20780+
#-----| True -> Block 3
20781+
20782+
# 2835| Block 3
20783+
# 2835| r2835_1(glval<int>) = VariableAddress[x] :
20784+
# 2835| r2835_2(int) = Load[x] : &:r2835_1, m2830_6
20785+
# 2835| r2835_3(int) = Constant[2] :
20786+
# 2835| r2835_4(bool) = CompareNE : r2835_2, r2835_3
20787+
# 2835| v2835_5(void) = ConditionalBranch : r2835_4
20788+
#-----| True -> Block 4
20789+
20790+
# 2837| Block 4
20791+
# 2837| r2837_1(glval<unsigned int>) = VariableAddress[u] :
20792+
# 2837| r2837_2(unsigned int) = Load[u] : &:r2837_1, m2830_10
20793+
# 2837| r2837_3(glval<int>) = VariableAddress[x] :
20794+
# 2837| r2837_4(int) = Load[x] : &:r2837_3, m2830_6
20795+
# 2837| r2837_5(bool) = CompareLT : r2837_2, r2837_4
20796+
# 2837| v2837_6(void) = ConditionalBranch : r2837_5
20797+
#-----| True -> Block 5
20798+
20799+
# 2840| Block 5
20800+
# 2840| r2840_1(glval<int>) = VariableAddress[shadowed] :
20801+
# 2840| r2840_2(glval<int>) = VariableAddress[x] :
20802+
# 2840| r2840_3(int) = Load[x] : &:r2840_2, m2830_6
20803+
# 2840| m2840_4(int) = Store[shadowed] : &:r2840_1, r2840_3
20804+
# 2841| r2841_1(int) = Constant[0] :
20805+
# 2841| v2841_2(void) = Convert : r2841_1
20806+
# 2843| v2843_1(void) = NoOp :
20807+
# 2830| v2830_13(void) = ReturnVoid :
20808+
# 2830| v2830_14(void) = AliasedUse : m2830_3
20809+
# 2830| v2830_15(void) = ExitFunction :
2077720810

2077820811
# 2846| void test_assert_in_template<int>(int, int, unsigned int)
2077920812
# 2846| Block 0
20780-
# 2846| v2846_1(void) = EnterFunction :
20781-
# 2846| m2846_2(unknown) = AliasedDefinition :
20782-
# 2846| m2846_3(unknown) = InitializeNonLocal :
20783-
# 2846| m2846_4(unknown) = Chi : total:m2846_2, partial:m2846_3
20784-
# 2846| r2846_5(glval<int>) = VariableAddress[x] :
20785-
# 2846| m2846_6(int) = InitializeParameter[x] : &:r2846_5
20786-
# 2846| r2846_7(glval<int>) = VariableAddress[y] :
20787-
# 2846| m2846_8(int) = InitializeParameter[y] : &:r2846_7
20788-
# 2846| r2846_9(glval<unsigned int>) = VariableAddress[u] :
20789-
# 2846| m2846_10(unsigned int) = InitializeParameter[u] : &:r2846_9
20790-
# 2847| r2847_1(int) = Constant[0] :
20791-
# 2847| v2847_2(void) = Convert : r2847_1
20792-
# 2848| r2848_1(int) = Constant[0] :
20793-
# 2848| v2848_2(void) = Convert : r2848_1
20794-
# 2849| r2849_1(int) = Constant[0] :
20795-
# 2849| v2849_2(void) = Convert : r2849_1
20796-
# 2851| v2851_1(void) = NoOp :
20797-
# 2853| r2853_1(int) = Constant[0] :
20798-
# 2853| v2853_2(void) = Convert : r2853_1
20799-
# 2856| r2856_1(glval<int>) = VariableAddress[shadowed] :
20800-
# 2856| r2856_2(glval<int>) = VariableAddress[x] :
20801-
# 2856| r2856_3(int) = Load[x] : &:r2856_2, m2846_6
20802-
# 2856| m2856_4(int) = Store[shadowed] : &:r2856_1, r2856_3
20803-
# 2857| r2857_1(int) = Constant[0] :
20804-
# 2857| v2857_2(void) = Convert : r2857_1
20805-
# 2859| v2859_1(void) = NoOp :
20806-
# 2846| v2846_11(void) = ReturnVoid :
20807-
# 2846| v2846_12(void) = AliasedUse : m2846_3
20808-
# 2846| v2846_13(void) = ExitFunction :
20813+
# 2846| v2846_1(void) = EnterFunction :
20814+
# 2846| m2846_2(unknown) = AliasedDefinition :
20815+
# 2846| m2846_3(unknown) = InitializeNonLocal :
20816+
# 2846| m2846_4(unknown) = Chi : total:m2846_2, partial:m2846_3
20817+
# 2846| r2846_5(glval<int>) = VariableAddress[x] :
20818+
# 2846| m2846_6(int) = InitializeParameter[x] : &:r2846_5
20819+
# 2846| r2846_7(glval<int>) = VariableAddress[y] :
20820+
# 2846| m2846_8(int) = InitializeParameter[y] : &:r2846_7
20821+
# 2846| r2846_9(glval<unsigned int>) = VariableAddress[u] :
20822+
# 2846| m2846_10(unsigned int) = InitializeParameter[u] : &:r2846_9
20823+
# 2847| r2847_1(glval<int>) = VariableAddress[x] :
20824+
# 2847| r2847_2(int) = Load[x] : &:r2847_1, m2846_6
20825+
# 2847| r2847_3(int) = Constant[0] :
20826+
# 2847| r2847_4(bool) = CompareGT : r2847_2, r2847_3
20827+
# 2847| v2847_5(void) = ConditionalBranch : r2847_4
20828+
#-----| True -> Block 1
20829+
20830+
# 2848| Block 1
20831+
# 2848| r2848_1(int) = Constant[0] :
20832+
# 2848| r2848_2(glval<int>) = VariableAddress[x] :
20833+
# 2848| r2848_3(int) = Load[x] : &:r2848_2, m2846_6
20834+
# 2848| r2848_4(bool) = CompareLT : r2848_1, r2848_3
20835+
# 2848| v2848_5(void) = ConditionalBranch : r2848_4
20836+
#-----| True -> Block 2
20837+
20838+
# 2849| Block 2
20839+
# 2849| r2849_1(glval<int>) = VariableAddress[x] :
20840+
# 2849| r2849_2(int) = Load[x] : &:r2849_1, m2846_6
20841+
# 2849| r2849_3(glval<int>) = VariableAddress[y] :
20842+
# 2849| r2849_4(int) = Load[y] : &:r2849_3, m2846_8
20843+
# 2849| r2849_5(bool) = CompareLT : r2849_2, r2849_4
20844+
# 2849| v2849_6(void) = ConditionalBranch : r2849_5
20845+
#-----| True -> Block 3
20846+
20847+
# 2851| Block 3
20848+
# 2851| r2851_1(glval<int>) = VariableAddress[x] :
20849+
# 2851| r2851_2(int) = Load[x] : &:r2851_1, m2846_6
20850+
# 2851| r2851_3(int) = Constant[2] :
20851+
# 2851| r2851_4(bool) = CompareNE : r2851_2, r2851_3
20852+
# 2851| v2851_5(void) = ConditionalBranch : r2851_4
20853+
#-----| True -> Block 4
20854+
20855+
# 2853| Block 4
20856+
# 2853| r2853_1(glval<unsigned int>) = VariableAddress[u] :
20857+
# 2853| r2853_2(unsigned int) = Load[u] : &:r2853_1, m2846_10
20858+
# 2853| r2853_3(glval<int>) = VariableAddress[x] :
20859+
# 2853| r2853_4(int) = Load[x] : &:r2853_3, m2846_6
20860+
# 2853| r2853_5(bool) = CompareLT : r2853_2, r2853_4
20861+
# 2853| v2853_6(void) = ConditionalBranch : r2853_5
20862+
#-----| True -> Block 5
20863+
20864+
# 2856| Block 5
20865+
# 2856| r2856_1(glval<int>) = VariableAddress[shadowed] :
20866+
# 2856| r2856_2(glval<int>) = VariableAddress[x] :
20867+
# 2856| r2856_3(int) = Load[x] : &:r2856_2, m2846_6
20868+
# 2856| m2856_4(int) = Store[shadowed] : &:r2856_1, r2856_3
20869+
# 2857| r2857_1(glval<int>) = VariableAddress[shadowed] :
20870+
# 2857| r2857_2(int) = Load[shadowed] : &:r2857_1, m2856_4
20871+
# 2857| r2857_3(int) = Constant[0] :
20872+
# 2857| r2857_4(bool) = CompareGT : r2857_2, r2857_3
20873+
# 2857| v2857_5(void) = ConditionalBranch : r2857_4
20874+
#-----| True -> Block 6
20875+
20876+
# 2859| Block 6
20877+
# 2859| v2859_1(void) = NoOp :
20878+
# 2846| v2846_11(void) = ReturnVoid :
20879+
# 2846| v2846_12(void) = AliasedUse : m2846_3
20880+
# 2846| v2846_13(void) = ExitFunction :
2080920881

2081020882
# 2846| void test_assert_in_template<short>(short, int, unsigned int)
2081120883
# 2846| Block 0
20812-
# 2846| v2846_1(void) = EnterFunction :
20813-
# 2846| m2846_2(unknown) = AliasedDefinition :
20814-
# 2846| m2846_3(unknown) = InitializeNonLocal :
20815-
# 2846| m2846_4(unknown) = Chi : total:m2846_2, partial:m2846_3
20816-
# 2846| r2846_5(glval<short>) = VariableAddress[x] :
20817-
# 2846| m2846_6(short) = InitializeParameter[x] : &:r2846_5
20818-
# 2846| r2846_7(glval<int>) = VariableAddress[y] :
20819-
# 2846| m2846_8(int) = InitializeParameter[y] : &:r2846_7
20820-
# 2846| r2846_9(glval<unsigned int>) = VariableAddress[u] :
20821-
# 2846| m2846_10(unsigned int) = InitializeParameter[u] : &:r2846_9
20822-
# 2847| r2847_1(int) = Constant[0] :
20823-
# 2847| v2847_2(void) = Convert : r2847_1
20824-
# 2848| r2848_1(int) = Constant[0] :
20825-
# 2848| v2848_2(void) = Convert : r2848_1
20826-
# 2849| r2849_1(int) = Constant[0] :
20827-
# 2849| v2849_2(void) = Convert : r2849_1
20828-
# 2851| v2851_1(void) = NoOp :
20829-
# 2853| r2853_1(int) = Constant[0] :
20830-
# 2853| v2853_2(void) = Convert : r2853_1
20831-
# 2856| r2856_1(glval<int>) = VariableAddress[shadowed] :
20832-
# 2856| r2856_2(glval<short>) = VariableAddress[x] :
20833-
# 2856| r2856_3(short) = Load[x] : &:r2856_2, m2846_6
20834-
# 2856| r2856_4(int) = Convert : r2856_3
20835-
# 2856| m2856_5(int) = Store[shadowed] : &:r2856_1, r2856_4
20836-
# 2857| r2857_1(int) = Constant[0] :
20837-
# 2857| v2857_2(void) = Convert : r2857_1
20838-
# 2859| v2859_1(void) = NoOp :
20839-
# 2846| v2846_11(void) = ReturnVoid :
20840-
# 2846| v2846_12(void) = AliasedUse : m2846_3
20841-
# 2846| v2846_13(void) = ExitFunction :
20884+
# 2846| v2846_1(void) = EnterFunction :
20885+
# 2846| m2846_2(unknown) = AliasedDefinition :
20886+
# 2846| m2846_3(unknown) = InitializeNonLocal :
20887+
# 2846| m2846_4(unknown) = Chi : total:m2846_2, partial:m2846_3
20888+
# 2846| r2846_5(glval<short>) = VariableAddress[x] :
20889+
# 2846| m2846_6(short) = InitializeParameter[x] : &:r2846_5
20890+
# 2846| r2846_7(glval<int>) = VariableAddress[y] :
20891+
# 2846| m2846_8(int) = InitializeParameter[y] : &:r2846_7
20892+
# 2846| r2846_9(glval<unsigned int>) = VariableAddress[u] :
20893+
# 2846| m2846_10(unsigned int) = InitializeParameter[u] : &:r2846_9
20894+
# 2847| r2847_1(glval<short>) = VariableAddress[x] :
20895+
# 2847| r2847_2(short) = Load[x] : &:r2847_1, m2846_6
20896+
# 2847| r2847_3(int) = Constant[0] :
20897+
# 2847| r2847_4(bool) = CompareGT : r2847_2, r2847_3
20898+
# 2847| v2847_5(void) = ConditionalBranch : r2847_4
20899+
#-----| True -> Block 1
20900+
20901+
# 2848| Block 1
20902+
# 2848| r2848_1(int) = Constant[0] :
20903+
# 2848| r2848_2(glval<short>) = VariableAddress[x] :
20904+
# 2848| r2848_3(short) = Load[x] : &:r2848_2, m2846_6
20905+
# 2848| r2848_4(bool) = CompareLT : r2848_1, r2848_3
20906+
# 2848| v2848_5(void) = ConditionalBranch : r2848_4
20907+
#-----| True -> Block 2
20908+
20909+
# 2849| Block 2
20910+
# 2849| r2849_1(glval<short>) = VariableAddress[x] :
20911+
# 2849| r2849_2(short) = Load[x] : &:r2849_1, m2846_6
20912+
# 2849| r2849_3(glval<int>) = VariableAddress[y] :
20913+
# 2849| r2849_4(int) = Load[y] : &:r2849_3, m2846_8
20914+
# 2849| r2849_5(bool) = CompareLT : r2849_2, r2849_4
20915+
# 2849| v2849_6(void) = ConditionalBranch : r2849_5
20916+
#-----| True -> Block 3
20917+
20918+
# 2851| Block 3
20919+
# 2851| r2851_1(glval<short>) = VariableAddress[x] :
20920+
# 2851| r2851_2(short) = Load[x] : &:r2851_1, m2846_6
20921+
# 2851| r2851_3(int) = Constant[2] :
20922+
# 2851| r2851_4(bool) = CompareNE : r2851_2, r2851_3
20923+
# 2851| v2851_5(void) = ConditionalBranch : r2851_4
20924+
#-----| True -> Block 4
20925+
20926+
# 2853| Block 4
20927+
# 2853| r2853_1(glval<unsigned int>) = VariableAddress[u] :
20928+
# 2853| r2853_2(unsigned int) = Load[u] : &:r2853_1, m2846_10
20929+
# 2853| r2853_3(glval<short>) = VariableAddress[x] :
20930+
# 2853| r2853_4(short) = Load[x] : &:r2853_3, m2846_6
20931+
# 2853| r2853_5(bool) = CompareLT : r2853_2, r2853_4
20932+
# 2853| v2853_6(void) = ConditionalBranch : r2853_5
20933+
#-----| True -> Block 5
20934+
20935+
# 2856| Block 5
20936+
# 2856| r2856_1(glval<int>) = VariableAddress[shadowed] :
20937+
# 2856| r2856_2(glval<short>) = VariableAddress[x] :
20938+
# 2856| r2856_3(short) = Load[x] : &:r2856_2, m2846_6
20939+
# 2856| r2856_4(int) = Convert : r2856_3
20940+
# 2856| m2856_5(int) = Store[shadowed] : &:r2856_1, r2856_4
20941+
# 2857| r2857_1(glval<int>) = VariableAddress[shadowed] :
20942+
# 2857| r2857_2(int) = Load[shadowed] : &:r2857_1, m2856_5
20943+
# 2857| r2857_3(int) = Constant[0] :
20944+
# 2857| r2857_4(bool) = CompareGT : r2857_2, r2857_3
20945+
# 2857| v2857_5(void) = ConditionalBranch : r2857_4
20946+
#-----| True -> Block 6
20947+
20948+
# 2859| Block 6
20949+
# 2859| v2859_1(void) = NoOp :
20950+
# 2846| v2846_11(void) = ReturnVoid :
20951+
# 2846| v2846_12(void) = AliasedUse : m2846_3
20952+
# 2846| v2846_13(void) = ExitFunction :
2084220953

2084320954
# 2864| void complex_assertions(int, bool, int)
2084420955
# 2864| Block 0

0 commit comments

Comments
 (0)