Skip to content

Commit 2ce5b85

Browse files
redsun82redsun82
authored
Merge pull request #7112 from github/redsun82/frontend-update
c++: update ir tests after frontend update
2 parents eed98bd + 8d3cf7f commit 2ce5b85

File tree

2 files changed

+59
-45
lines changed

2 files changed

+59
-45
lines changed

‎cpp/ql/test/library-tests/ir/ir/PrintAST.expected

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11251,10 +11251,13 @@ ir.cpp:
1125111251
# 1444| getExpr(): [FunctionCall] call to returnValue
1125211252
# 1444| Type = [Struct] POD_Middle
1125311253
# 1444| ValueCategory = prvalue
11254-
# 1444| getExpr().getFullyConverted(): [CStyleCast] (POD_Base)...
11255-
# 1444| Conversion = [BaseClassConversion] base class conversion
11256-
# 1444| Type = [Struct] POD_Base
11257-
# 1444| ValueCategory = prvalue
11254+
#-----| getExpr().getFullyConverted(): [CStyleCast] (POD_Base)...
11255+
#-----| Conversion = [BaseClassConversion] base class conversion
11256+
#-----| Type = [Struct] POD_Base
11257+
#-----| ValueCategory = prvalue(load)
11258+
#-----| getExpr(): [TemporaryObjectExpr] temporary object
11259+
#-----| Type = [Struct] POD_Middle
11260+
#-----| ValueCategory = xvalue
1125811261
# 1445| getStmt(1): [ExprStmt] ExprStmt
1125911262
# 1445| getExpr(): [AssignExpr] ... = ...
1126011263
# 1445| Type = [Struct] POD_Base
@@ -11285,18 +11288,21 @@ ir.cpp:
1128511288
# 1446| getVariable().getInitializer(): [Initializer] initializer for x
1128611289
# 1446| getExpr(): [ValueFieldAccess] x
1128711290
# 1446| Type = [IntType] int
11288-
# 1446| ValueCategory = prvalue
11291+
# 1446| ValueCategory = prvalue(load)
1128911292
# 1446| getQualifier(): [FunctionCall] call to returnValue
1129011293
# 1446| Type = [Struct] POD_Derived
1129111294
# 1446| ValueCategory = prvalue
11292-
# 1446| getQualifier().getFullyConverted(): [CStyleCast] (POD_Base)...
11293-
# 1446| Conversion = [BaseClassConversion] base class conversion
11294-
# 1446| Type = [Struct] POD_Base
11295-
# 1446| ValueCategory = prvalue
11296-
# 1446| getExpr(): [CStyleCast] (POD_Middle)...
11297-
# 1446| Conversion = [BaseClassConversion] base class conversion
11298-
# 1446| Type = [Struct] POD_Middle
11299-
# 1446| ValueCategory = prvalue
11295+
#-----| getQualifier().getFullyConverted(): [CStyleCast] (POD_Base)...
11296+
#-----| Conversion = [BaseClassConversion] base class conversion
11297+
#-----| Type = [Struct] POD_Base
11298+
#-----| ValueCategory = xvalue
11299+
#-----| getExpr(): [CStyleCast] (POD_Middle)...
11300+
#-----| Conversion = [BaseClassConversion] base class conversion
11301+
#-----| Type = [Struct] POD_Middle
11302+
#-----| ValueCategory = xvalue
11303+
#-----| getExpr(): [TemporaryObjectExpr] temporary object
11304+
#-----| Type = [Struct] POD_Derived
11305+
#-----| ValueCategory = xvalue
1130011306
# 1447| getStmt(3): [DeclStmt] declaration
1130111307
# 1447| getDeclarationEntry(0): [VariableDeclarationEntry] definition of f
1130211308
# 1447| Type = [FloatType] float
@@ -11307,17 +11313,24 @@ ir.cpp:
1130711313
# 1447| getQualifier(): [FunctionCall] call to returnValue
1130811314
# 1447| Type = [Struct] POD_Derived
1130911315
# 1447| ValueCategory = prvalue
11310-
# 1447| getQualifier().getFullyConverted(): [CStyleCast] (const POD_Base)...
11311-
# 1447| Conversion = [BaseClassConversion] base class conversion
11312-
# 1447| Type = [SpecifiedType] const POD_Base
11313-
# 1447| ValueCategory = prvalue
11314-
# 1447| getExpr(): [CStyleCast] (POD_Middle)...
11315-
# 1447| Conversion = [BaseClassConversion] base class conversion
11316-
# 1447| Type = [Struct] POD_Middle
11317-
# 1447| ValueCategory = prvalue
11318-
# 1447| getExpr(): [ParenthesisExpr] (...)
11319-
# 1447| Type = [Struct] POD_Derived
11320-
# 1447| ValueCategory = prvalue
11316+
#-----| getQualifier().getFullyConverted(): [CStyleCast] (const POD_Base)...
11317+
#-----| Conversion = [GlvalueConversion] glvalue conversion
11318+
#-----| Type = [SpecifiedType] const POD_Base
11319+
#-----| ValueCategory = xvalue
11320+
#-----| getExpr(): [CStyleCast] (POD_Base)...
11321+
#-----| Conversion = [BaseClassConversion] base class conversion
11322+
#-----| Type = [Struct] POD_Base
11323+
#-----| ValueCategory = xvalue
11324+
#-----| getExpr(): [CStyleCast] (POD_Middle)...
11325+
#-----| Conversion = [BaseClassConversion] base class conversion
11326+
#-----| Type = [Struct] POD_Middle
11327+
#-----| ValueCategory = xvalue
11328+
#-----| getExpr(): [TemporaryObjectExpr] temporary object
11329+
#-----| Type = [Struct] POD_Derived
11330+
#-----| ValueCategory = xvalue
11331+
# 1447| getExpr(): [ParenthesisExpr] (...)
11332+
# 1447| Type = [Struct] POD_Derived
11333+
# 1447| ValueCategory = prvalue
1132111334
# 1448| getStmt(4): [ReturnStmt] return ...
1132211335
perf-regression.cpp:
1132311336
# 4| [CopyAssignmentOperator] Big& Big::operator=(Big const&)

‎cpp/ql/test/library-tests/ir/ir/raw_ir.expected

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7810,14 +7810,14 @@ ir.cpp:
78107810
# 1443| mu1443_2(unknown) = AliasedDefinition :
78117811
# 1443| mu1443_3(unknown) = InitializeNonLocal :
78127812
# 1444| r1444_1(glval<POD_Base>) = VariableAddress[b] :
7813+
#-----| r0_1(glval<POD_Middle>) = VariableAddress[#temp0:0] :
78137814
# 1444| r1444_2(glval<unknown>) = FunctionAddress[returnValue] :
78147815
# 1444| r1444_3(POD_Middle) = Call[returnValue] : func:r1444_2
78157816
# 1444| mu1444_4(unknown) = ^CallSideEffect : ~m?
7816-
# 1444| r1444_5(glval<POD_Middle>) = VariableAddress[#temp1444:18] :
7817-
# 1444| mu1444_6(POD_Middle) = Store[#temp1444:18] : &:r1444_5, r1444_3
7818-
# 1444| r1444_7(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r1444_5
7819-
# 1444| r1444_8(POD_Base) = Load[?] : &:r1444_7, ~m?
7820-
# 1444| mu1444_9(POD_Base) = Store[b] : &:r1444_1, r1444_8
7817+
# 1444| mu1444_5(POD_Middle) = Store[#temp0:0] : &:r0_1, r1444_3
7818+
#-----| r0_2(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r0_1
7819+
#-----| r0_3(POD_Base) = Load[?] : &:r0_2, ~m?
7820+
#-----| mu0_4(POD_Base) = Store[b] : &:r1444_1, r0_3
78217821
# 1445| r1445_1(glval<POD_Derived>) = VariableAddress[#temp1445:9] :
78227822
# 1445| r1445_2(glval<unknown>) = FunctionAddress[returnValue] :
78237823
# 1445| r1445_3(POD_Derived) = Call[returnValue] : func:r1445_2
@@ -7829,29 +7829,30 @@ ir.cpp:
78297829
# 1445| r1445_9(glval<POD_Base>) = VariableAddress[b] :
78307830
# 1445| mu1445_10(POD_Base) = Store[b] : &:r1445_9, r1445_8
78317831
# 1446| r1446_1(glval<int>) = VariableAddress[x] :
7832+
#-----| r0_5(glval<POD_Derived>) = VariableAddress[#temp0:0] :
78327833
# 1446| r1446_2(glval<unknown>) = FunctionAddress[returnValue] :
78337834
# 1446| r1446_3(POD_Derived) = Call[returnValue] : func:r1446_2
78347835
# 1446| mu1446_4(unknown) = ^CallSideEffect : ~m?
7835-
# 1446| r1446_5(glval<POD_Derived>) = VariableAddress[#temp1446:13] :
7836-
# 1446| mu1446_6(POD_Derived) = Store[#temp1446:13] : &:r1446_5, r1446_3
7837-
# 1446| r1446_7(glval<POD_Middle>) = ConvertToNonVirtualBase[POD_Derived : POD_Middle] : r1446_5
7838-
# 1446| r1446_8(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r1446_7
7839-
# 1446| r1446_9(glval<int>) = FieldAddress[x] : r1446_8
7840-
# 1446| r1446_10(int) = Load[?] : &:r1446_9, ~m?
7841-
# 1446| mu1446_11(int) = Store[x] : &:r1446_1, r1446_10
7836+
# 1446| mu1446_5(POD_Derived) = Store[#temp0:0] : &:r0_5, r1446_3
7837+
#-----| r0_6(glval<POD_Middle>) = ConvertToNonVirtualBase[POD_Derived : POD_Middle] : r0_5
7838+
#-----| r0_7(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r0_6
7839+
# 1446| r1446_6(glval<int>) = FieldAddress[x] : r0_7
7840+
# 1446| r1446_7(int) = Load[?] : &:r1446_6, ~m?
7841+
# 1446| mu1446_8(int) = Store[x] : &:r1446_1, r1446_7
78427842
# 1447| r1447_1(glval<float>) = VariableAddress[f] :
7843+
#-----| r0_8(glval<POD_Derived>) = VariableAddress[#temp0:0] :
78437844
# 1447| r1447_2(glval<unknown>) = FunctionAddress[returnValue] :
78447845
# 1447| r1447_3(POD_Derived) = Call[returnValue] : func:r1447_2
78457846
# 1447| mu1447_4(unknown) = ^CallSideEffect : ~m?
7846-
# 1447| r1447_5(glval<POD_Derived>) = VariableAddress[#temp1447:16] :
7847-
# 1447| mu1447_6(POD_Derived) = Store[#temp1447:16] : &:r1447_5, r1447_3
7848-
# 1447| r1447_7(glval<POD_Middle>) = ConvertToNonVirtualBase[POD_Derived : POD_Middle] : r1447_5
7849-
# 1447| r1447_8(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r1447_7
7850-
# 1447| r1447_9(glval<unknown>) = FunctionAddress[f] :
7851-
# 1447| r1447_10(float) = Call[f] : func:r1447_9, this:r1447_8
7852-
# 1447| mu1447_11(unknown) = ^CallSideEffect : ~m?
7853-
# 1447| v1447_12(void) = ^IndirectReadSideEffect[-1] : &:r1447_8, ~m?
7854-
# 1447| mu1447_13(float) = Store[f] : &:r1447_1, r1447_10
7847+
# 1447| mu1447_5(POD_Derived) = Store[#temp0:0] : &:r0_8, r1447_3
7848+
#-----| r0_9(glval<POD_Middle>) = ConvertToNonVirtualBase[POD_Derived : POD_Middle] : r0_8
7849+
#-----| r0_10(glval<POD_Base>) = ConvertToNonVirtualBase[POD_Middle : POD_Base] : r0_9
7850+
#-----| r0_11(glval<POD_Base>) = Convert : r0_10
7851+
# 1447| r1447_6(glval<unknown>) = FunctionAddress[f] :
7852+
# 1447| r1447_7(float) = Call[f] : func:r1447_6, this:r0_11
7853+
# 1447| mu1447_8(unknown) = ^CallSideEffect : ~m?
7854+
#-----| v0_12(void) = ^IndirectReadSideEffect[-1] : &:r0_11, ~m?
7855+
# 1447| mu1447_9(float) = Store[f] : &:r1447_1, r1447_7
78557856
# 1448| v1448_1(void) = NoOp :
78567857
# 1443| v1443_4(void) = ReturnVoid :
78577858
# 1443| v1443_5(void) = AliasedUse : ~m?

0 commit comments

Comments
 (0)