Skip to content

Commit cf996f8

Browse files
committed
C++: Accept test changes.
1 parent 17e8c95 commit cf996f8

8 files changed

Lines changed: 192 additions & 358 deletions

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

Lines changed: 45 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,8 +1175,8 @@ destructors_for_temps.cpp:
11751175
# 52| r52_2(glval<ClassWithDestructor2>) = VariableAddress[c] :
11761176
# 52| r52_3(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
11771177
# 52| v52_4(void) = Call[~ClassWithDestructor2] : func:r52_3, this:r52_2
1178-
# 52| m52_5(unknown) = ^CallSideEffect : ~m51_104, ~m51_72
1179-
# 52| m52_6(unknown) = Chi : total:m51_104, total:m51_72, partial:m52_5
1178+
# 52| m52_5(unknown) = ^CallSideEffect : ~m51_62, ~m51_84
1179+
# 52| m52_6(unknown) = Chi : total:m51_62, total:m51_84, partial:m52_5
11801180
# 52| v52_7(void) = ^IndirectReadSideEffect[-1] : &:r52_2, m50_8
11811181
# 52| m52_8(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r52_2
11821182
# 52| m52_9(ClassWithDestructor2) = Chi : total:m50_8, partial:m52_8
@@ -1233,40 +1233,31 @@ destructors_for_temps.cpp:
12331233
#-----| Goto -> Block 8
12341234

12351235
# 51| Block 8
1236-
# 51| m51_82(ClassWithDestructor2) = Phi : from 4:m51_59, from 4:m51_91
1237-
# 51| m51_83(unknown) = Phi : from 4:~m51_104, from 4:~m51_72, from 6:~m51_37
1238-
# 51| m51_80(ClassWithDestructor2) = Phi : from 4:m51_67, from 4:m51_99, from 6:m51_39
1239-
# 51| m51_81(ClassWithDestructor2) = Phi : from 4:m51_107, from 4:m51_75
1240-
# 51| r51_84(glval<ClassWithDestructor2>) = CopyValue : r51_1
1241-
# 51| r51_85(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1242-
# 51| v51_86(void) = Call[~ClassWithDestructor2] : func:r51_53, func:r51_85, this:r51_52, this:r51_84
1243-
# 51| m51_87(unknown) = ^CallSideEffect : ~m51_47, ~m51_51, ~m51_79, ~m51_83
1244-
# 51| m51_88(unknown) = Chi : total:m51_47, total:m51_51, total:m51_79, total:m51_83, partial:m51_55, partial:m51_87
1245-
# 51| v51_89(void) = ^IndirectReadSideEffect[-1] : &:r51_52, &:r51_84, m51_46, m51_50, m51_78, m51_82
1246-
# 51| m51_90(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r51_52, &:r51_84
1247-
# 51| m51_91(ClassWithDestructor2) = Chi : total:m51_46, total:m51_50, total:m51_78, total:m51_82, partial:m51_58, partial:m51_90
1248-
# 51| r51_92(glval<ClassWithDestructor2>) = CopyValue : r51_32
1249-
# 51| r51_93(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1250-
# 51| v51_94(void) = Call[~ClassWithDestructor2] : func:r51_61, func:r51_93, this:r51_60, this:r51_92
1251-
# 51| m51_95(unknown) = ^CallSideEffect : ~m51_56, ~m51_88
1252-
# 51| m51_96(unknown) = Chi : total:m51_56, total:m51_88, partial:m51_63, partial:m51_95
1253-
# 51| v51_97(void) = ^IndirectReadSideEffect[-1] : &:r51_60, &:r51_92, m51_44, m51_48, m51_76, m51_80
1254-
# 51| m51_98(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r51_60, &:r51_92
1255-
# 51| m51_99(ClassWithDestructor2) = Chi : total:m51_44, total:m51_48, total:m51_76, total:m51_80, partial:m51_66, partial:m51_98
1256-
# 51| r51_68(glval<ClassWithDestructor2>) = CopyValue : r51_11
1257-
# 51| r51_69(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1258-
# 51| v51_70(void) = Call[~ClassWithDestructor2] : func:r51_101, func:r51_69, this:r51_100, this:r51_68
1259-
# 51| m51_71(unknown) = ^CallSideEffect : ~m51_64, ~m51_96
1260-
# 51| m51_72(unknown) = Chi : total:m51_64, total:m51_96, partial:m51_103, partial:m51_71
1261-
# 51| v51_73(void) = ^IndirectReadSideEffect[-1] : &:r51_100, &:r51_68, m51_45, m51_49, m51_77, m51_81
1262-
# 51| m51_74(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r51_100, &:r51_68
1263-
# 51| m51_75(ClassWithDestructor2) = Chi : total:m51_45, total:m51_49, total:m51_77, total:m51_81, partial:m51_106, partial:m51_74
1264-
#-----| Goto (back edge) -> Block 4
1236+
# 51| m51_70(ClassWithDestructor2) = Phi : from 4:m51_57, from 4:m51_79
1237+
# 51| m51_71(unknown) = Phi : from 4:~m51_62, from 4:~m51_84, from 6:~m51_37
1238+
# 51| m51_69(ClassWithDestructor2) = Phi : from 4:m51_65, from 4:m51_87, from 6:m51_39
1239+
# 51| r51_72(glval<ClassWithDestructor2>) = CopyValue : r51_1
1240+
# 51| r51_73(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1241+
# 51| v51_74(void) = Call[~ClassWithDestructor2] : func:r51_51, func:r51_73, this:r51_50, this:r51_72
1242+
# 51| m51_75(unknown) = ^CallSideEffect : ~m51_46, ~m51_49, ~m51_68, ~m51_71
1243+
# 51| m51_76(unknown) = Chi : total:m51_46, total:m51_49, total:m51_68, total:m51_71, partial:m51_53, partial:m51_75
1244+
# 51| v51_77(void) = ^IndirectReadSideEffect[-1] : &:r51_50, &:r51_72, m51_45, m51_48, m51_67, m51_70
1245+
# 51| m51_78(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r51_50, &:r51_72
1246+
# 51| m51_79(ClassWithDestructor2) = Chi : total:m51_45, total:m51_48, total:m51_67, total:m51_70, partial:m51_56, partial:m51_78
1247+
# 51| r51_80(glval<ClassWithDestructor2>) = CopyValue : r51_32
1248+
# 51| r51_81(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1249+
# 51| v51_82(void) = Call[~ClassWithDestructor2] : func:r51_59, func:r51_81, this:r51_58, this:r51_80
1250+
# 51| m51_83(unknown) = ^CallSideEffect : ~m51_54, ~m51_76
1251+
# 51| m51_84(unknown) = Chi : total:m51_54, total:m51_76, partial:m51_61, partial:m51_83
1252+
# 51| v51_85(void) = ^IndirectReadSideEffect[-1] : &:r51_58, &:r51_80, m51_44, m51_47, m51_66, m51_69
1253+
# 51| m51_86(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r51_58, &:r51_80
1254+
# 51| m51_87(ClassWithDestructor2) = Chi : total:m51_44, total:m51_47, total:m51_66, total:m51_69, partial:m51_64, partial:m51_86
12651255
#-----| Goto (back edge) -> Block 3
1256+
#-----| Goto (back edge) -> Block 4
12661257

12671258
# 51| Block 8
1268-
#-----| Goto (back edge) -> Block 4
12691259
#-----| Goto (back edge) -> Block 3
1260+
#-----| Goto (back edge) -> Block 4
12701261

12711262
# 54| void temp_test8(bool)
12721263
# 54| Block 0
@@ -1284,7 +1275,7 @@ destructors_for_temps.cpp:
12841275
#-----| True -> Block 5
12851276

12861277
# 54| Block 1
1287-
# 54| m54_7(unknown) = Phi : from 2:~m55_28, from 3:~m55_104, from 3:~m55_72
1278+
# 54| m54_7(unknown) = Phi : from 2:~m55_28, from 3:~m55_62, from 3:~m55_84
12881279
# 54| v54_8(void) = AliasedUse : ~m54_7
12891280
# 54| v54_9(void) = ExitFunction :
12901281

@@ -1348,40 +1339,31 @@ destructors_for_temps.cpp:
13481339
#-----| Goto -> Block 8
13491340

13501341
# 55| Block 8
1351-
# 55| m55_82(ClassWithDestructor2) = Phi : from 4:m55_107, from 4:m55_75
1352-
# 55| m55_83(unknown) = Phi : from 4:~m55_104, from 4:~m55_72, from 6:~m55_37
1353-
# 55| m55_80(ClassWithDestructor2) = Phi : from 4:m55_59, from 4:m55_91
1354-
# 55| m55_81(ClassWithDestructor2) = Phi : from 4:m55_67, from 4:m55_99, from 6:m55_39
1355-
# 55| r55_84(glval<ClassWithDestructor2>) = CopyValue : r55_1
1356-
# 55| r55_85(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1357-
# 55| v55_86(void) = Call[~ClassWithDestructor2] : func:r55_53, func:r55_85, this:r55_52, this:r55_84
1358-
# 55| m55_87(unknown) = ^CallSideEffect : ~m55_47, ~m55_51, ~m55_79, ~m55_83
1359-
# 55| m55_88(unknown) = Chi : total:m55_47, total:m55_51, total:m55_79, total:m55_83, partial:m55_55, partial:m55_87
1360-
# 55| v55_89(void) = ^IndirectReadSideEffect[-1] : &:r55_52, &:r55_84, m55_44, m55_48, m55_76, m55_80
1361-
# 55| m55_90(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r55_52, &:r55_84
1362-
# 55| m55_91(ClassWithDestructor2) = Chi : total:m55_44, total:m55_48, total:m55_76, total:m55_80, partial:m55_58, partial:m55_90
1363-
# 55| r55_92(glval<ClassWithDestructor2>) = CopyValue : r55_32
1364-
# 55| r55_93(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1365-
# 55| v55_94(void) = Call[~ClassWithDestructor2] : func:r55_61, func:r55_93, this:r55_60, this:r55_92
1366-
# 55| m55_95(unknown) = ^CallSideEffect : ~m55_56, ~m55_88
1367-
# 55| m55_96(unknown) = Chi : total:m55_56, total:m55_88, partial:m55_63, partial:m55_95
1368-
# 55| v55_97(void) = ^IndirectReadSideEffect[-1] : &:r55_60, &:r55_92, m55_45, m55_49, m55_77, m55_81
1369-
# 55| m55_98(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r55_60, &:r55_92
1370-
# 55| m55_99(ClassWithDestructor2) = Chi : total:m55_45, total:m55_49, total:m55_77, total:m55_81, partial:m55_66, partial:m55_98
1371-
# 55| r55_68(glval<ClassWithDestructor2>) = CopyValue : r55_11
1372-
# 55| r55_69(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1373-
# 55| v55_70(void) = Call[~ClassWithDestructor2] : func:r55_101, func:r55_69, this:r55_100, this:r55_68
1374-
# 55| m55_71(unknown) = ^CallSideEffect : ~m55_64, ~m55_96
1375-
# 55| m55_72(unknown) = Chi : total:m55_64, total:m55_96, partial:m55_103, partial:m55_71
1376-
# 55| v55_73(void) = ^IndirectReadSideEffect[-1] : &:r55_100, &:r55_68, m55_46, m55_50, m55_78, m55_82
1377-
# 55| m55_74(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r55_100, &:r55_68
1378-
# 55| m55_75(ClassWithDestructor2) = Chi : total:m55_46, total:m55_50, total:m55_78, total:m55_82, partial:m55_106, partial:m55_74
1379-
#-----| Goto (back edge) -> Block 4
1342+
# 55| m55_70(ClassWithDestructor2) = Phi : from 4:m55_65, from 4:m55_87, from 6:m55_39
1343+
# 55| m55_71(unknown) = Phi : from 4:~m55_62, from 4:~m55_84, from 6:~m55_37
1344+
# 55| m55_69(ClassWithDestructor2) = Phi : from 4:m55_57, from 4:m55_79
1345+
# 55| r55_72(glval<ClassWithDestructor2>) = CopyValue : r55_1
1346+
# 55| r55_73(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1347+
# 55| v55_74(void) = Call[~ClassWithDestructor2] : func:r55_51, func:r55_73, this:r55_50, this:r55_72
1348+
# 55| m55_75(unknown) = ^CallSideEffect : ~m55_46, ~m55_49, ~m55_68, ~m55_71
1349+
# 55| m55_76(unknown) = Chi : total:m55_46, total:m55_49, total:m55_68, total:m55_71, partial:m55_53, partial:m55_75
1350+
# 55| v55_77(void) = ^IndirectReadSideEffect[-1] : &:r55_50, &:r55_72, m55_44, m55_47, m55_66, m55_69
1351+
# 55| m55_78(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r55_50, &:r55_72
1352+
# 55| m55_79(ClassWithDestructor2) = Chi : total:m55_44, total:m55_47, total:m55_66, total:m55_69, partial:m55_56, partial:m55_78
1353+
# 55| r55_80(glval<ClassWithDestructor2>) = CopyValue : r55_32
1354+
# 55| r55_81(glval<unknown>) = FunctionAddress[~ClassWithDestructor2] :
1355+
# 55| v55_82(void) = Call[~ClassWithDestructor2] : func:r55_59, func:r55_81, this:r55_58, this:r55_80
1356+
# 55| m55_83(unknown) = ^CallSideEffect : ~m55_54, ~m55_76
1357+
# 55| m55_84(unknown) = Chi : total:m55_54, total:m55_76, partial:m55_61, partial:m55_83
1358+
# 55| v55_85(void) = ^IndirectReadSideEffect[-1] : &:r55_58, &:r55_80, m55_45, m55_48, m55_67, m55_70
1359+
# 55| m55_86(ClassWithDestructor2) = ^IndirectMayWriteSideEffect[-1] : &:r55_58, &:r55_80
1360+
# 55| m55_87(ClassWithDestructor2) = Chi : total:m55_45, total:m55_48, total:m55_67, total:m55_70, partial:m55_64, partial:m55_86
13801361
#-----| Goto (back edge) -> Block 3
1362+
#-----| Goto (back edge) -> Block 4
13811363

13821364
# 55| Block 8
1383-
#-----| Goto (back edge) -> Block 4
13841365
#-----| Goto (back edge) -> Block 3
1366+
#-----| Goto (back edge) -> Block 4
13851367

13861368
ir.c:
13871369
# 7| void MyCoordsTest(int)

0 commit comments

Comments
 (0)