C++: Split bad_asts.cpp IR test into two files

jketema · jketema · commit 06767c676049 · 2023-01-17T18:57:29.000+01:00
The statements from `errorExpr` - which does not parse correctly - affected the
tuples that were being generated for the other code in `bad_asts.cpp` due to
the way the front-end handles parse errors. This did not affect the test
results, but was also not the intention of the test. Split off `errorExpr` into
a separate file.
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -207,34 +207,35 @@ bad_asts.cpp:
 #   27|                 Type = [SpecifiedType] const Point
 #   27|                 ValueCategory = lvalue
 #   28|     getStmt(1): [ReturnStmt] return ...
-#   30| [TopLevelFunction] void Bad::errorExpr()
-#   30|   <params>: 
-#   30|   getEntryPoint(): [BlockStmt] { ... }
-#   31|     getStmt(0): [DeclStmt] declaration
-#   31|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of intref
-#   31|           Type = [LValueReferenceType] int &
-#   31|         getVariable().getInitializer(): [Initializer] initializer for intref
-#   31|           getExpr(): [ErrorExpr] <error expr>
-#   31|               Type = [ErroneousType] error
-#   31|               ValueCategory = prvalue
-#   32|     getStmt(1): [DeclStmt] declaration
-#   32|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
-#   32|           Type = [IntType] int
-#   32|         getVariable().getInitializer(): [Initializer] initializer for x
-#   32|           getExpr(): [ErrorExpr] <error expr>
-#   32|               Type = [ErroneousType] error
-#   32|               ValueCategory = prvalue
-#   33|     getStmt(2): [ExprStmt] ExprStmt
-#   33|       getExpr(): [AssignExpr] ... = ...
-#   33|           Type = [IntType] int
-#   33|           ValueCategory = lvalue
-#   33|         getLValue(): [VariableAccess] x
-#   33|             Type = [IntType] int
-#   33|             ValueCategory = lvalue
-#   33|         getRValue(): [ErrorExpr] <error expr>
-#   33|             Type = [ErroneousType] error
-#   33|             ValueCategory = prvalue(load)
-#   34|     getStmt(3): [ReturnStmt] return ...
+bad_stmts.cpp:
+#    5| [TopLevelFunction] void Bad::errorExpr()
+#    5|   <params>: 
+#    5|   getEntryPoint(): [BlockStmt] { ... }
+#    6|     getStmt(0): [DeclStmt] declaration
+#    6|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of intref
+#    6|           Type = [LValueReferenceType] int &
+#    6|         getVariable().getInitializer(): [Initializer] initializer for intref
+#    6|           getExpr(): [ErrorExpr] <error expr>
+#    6|               Type = [ErroneousType] error
+#    6|               ValueCategory = prvalue
+#    7|     getStmt(1): [DeclStmt] declaration
+#    7|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
+#    7|           Type = [IntType] int
+#    7|         getVariable().getInitializer(): [Initializer] initializer for x
+#    7|           getExpr(): [ErrorExpr] <error expr>
+#    7|               Type = [ErroneousType] error
+#    7|               ValueCategory = prvalue
+#    8|     getStmt(2): [ExprStmt] ExprStmt
+#    8|       getExpr(): [AssignExpr] ... = ...
+#    8|           Type = [IntType] int
+#    8|           ValueCategory = lvalue
+#    8|         getLValue(): [VariableAccess] x
+#    8|             Type = [IntType] int
+#    8|             ValueCategory = lvalue
+#    8|         getRValue(): [ErrorExpr] <error expr>
+#    8|             Type = [ErroneousType] error
+#    8|             ValueCategory = prvalue(load)
+#    9|     getStmt(3): [ReturnStmt] return ...
 clang.cpp:
 #    5| [TopLevelFunction] int* globalIntAddress()
 #    5|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/bad_asts.cpp b/cpp/ql/test/library-tests/ir/ir/bad_asts.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: -std=c++17 --expect_errors
+// semmle-extractor-options: -std=c++17
 
 // Test cases that illustrate known bad ASTs that we have to work around in IR generation.
 namespace Bad {
@@ -26,10 +26,4 @@ namespace Bad {
   void CallCopyConstructor(const Point& a) {
     Point b = a;  // Copy constructor contains literal expressions with no values.
   }
-
-  void errorExpr() {
-    int &intref = 0;
-    int x = 0[0];
-    x = 1[1];
-  }
 }
diff --git a/cpp/ql/test/library-tests/ir/ir/bad_stmts.cpp b/cpp/ql/test/library-tests/ir/ir/bad_stmts.cpp
@@ -0,0 +1,10 @@
+// semmle-extractor-options: -std=c++17 --expect_errors
+
+// Test cases that illustrate known bad ASTs that we have to work around in IR generation.
+namespace Bad {
+  void errorExpr() {
+    int &intref = 0;
+    int x = 0[0];
+    x = 1[1];
+  }
+}
diff --git a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -98,17 +98,17 @@
 | bad_asts.cpp:27:15:27:15 | StoreValue | r27_6 |
 | bad_asts.cpp:27:15:27:15 | Unary | r27_3 |
 | bad_asts.cpp:27:15:27:15 | Unary | r27_4 |
-| bad_asts.cpp:30:8:30:16 | ChiPartial | partial:m30_3 |
-| bad_asts.cpp:30:8:30:16 | ChiTotal | total:m30_2 |
-| bad_asts.cpp:30:8:30:16 | SideEffect | m30_3 |
-| bad_asts.cpp:31:10:31:15 | Address | &:r31_1 |
-| bad_asts.cpp:31:18:31:19 | StoreValue | r31_2 |
-| bad_asts.cpp:32:9:32:9 | Address | &:r32_1 |
-| bad_asts.cpp:32:12:32:16 | StoreValue | r32_2 |
-| bad_asts.cpp:33:5:33:5 | Address | &:r33_3 |
-| bad_asts.cpp:33:5:33:12 | Address | &:r33_1 |
-| bad_asts.cpp:33:5:33:12 | Load | ~m30_4 |
-| bad_asts.cpp:33:5:33:12 | StoreValue | r33_2 |
+| bad_stmts.cpp:5:8:5:16 | ChiPartial | partial:m5_3 |
+| bad_stmts.cpp:5:8:5:16 | ChiTotal | total:m5_2 |
+| bad_stmts.cpp:5:8:5:16 | SideEffect | m5_3 |
+| bad_stmts.cpp:6:10:6:15 | Address | &:r6_1 |
+| bad_stmts.cpp:6:18:6:19 | StoreValue | r6_2 |
+| bad_stmts.cpp:7:9:7:9 | Address | &:r7_1 |
+| bad_stmts.cpp:7:12:7:16 | StoreValue | r7_2 |
+| bad_stmts.cpp:8:5:8:5 | Address | &:r8_3 |
+| bad_stmts.cpp:8:5:8:12 | Address | &:r8_1 |
+| bad_stmts.cpp:8:5:8:12 | Load | ~m5_4 |
+| bad_stmts.cpp:8:5:8:12 | StoreValue | r8_2 |
 | clang.cpp:5:6:5:21 | Address | &:r5_5 |
 | clang.cpp:5:6:5:21 | ChiPartial | partial:m5_3 |
 | clang.cpp:5:6:5:21 | ChiTotal | total:m5_2 |
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -120,25 +120,26 @@ bad_asts.cpp:
 #   26|     v26_10(void)          = AliasedUse               : ~m?
 #   26|     v26_11(void)          = ExitFunction             : 
 
-#   30| void Bad::errorExpr()
-#   30|   Block 0
-#   30|     v30_1(void)         = EnterFunction           : 
-#   30|     mu30_2(unknown)     = AliasedDefinition       : 
-#   30|     mu30_3(unknown)     = InitializeNonLocal      : 
-#   31|     r31_1(glval<int &>) = VariableAddress[intref] : 
-#   31|     r31_2(error)        = Error                   : 
-#   31|     mu31_3(int &)       = Store[intref]           : &:r31_1, r31_2
-#   32|     r32_1(glval<int>)   = VariableAddress[x]      : 
-#   32|     r32_2(error)        = Error                   : 
-#   32|     mu32_3(int)         = Store[x]                : &:r32_1, r32_2
-#   33|     r33_1(glval<error>) = Error                   : 
-#   33|     r33_2(error)        = Load[?]                 : &:r33_1, ~m?
-#   33|     r33_3(glval<int>)   = VariableAddress[x]      : 
-#   33|     mu33_4(int)         = Store[x]                : &:r33_3, r33_2
-#   34|     v34_1(void)         = NoOp                    : 
-#   30|     v30_4(void)         = ReturnVoid              : 
-#   30|     v30_5(void)         = AliasedUse              : ~m?
-#   30|     v30_6(void)         = ExitFunction            : 
+bad_stmts.cpp:
+#    5| void Bad::errorExpr()
+#    5|   Block 0
+#    5|     v5_1(void)         = EnterFunction           : 
+#    5|     mu5_2(unknown)     = AliasedDefinition       : 
+#    5|     mu5_3(unknown)     = InitializeNonLocal      : 
+#    6|     r6_1(glval<int &>) = VariableAddress[intref] : 
+#    6|     r6_2(error)        = Error                   : 
+#    6|     mu6_3(int &)       = Store[intref]           : &:r6_1, r6_2
+#    7|     r7_1(glval<int>)   = VariableAddress[x]      : 
+#    7|     r7_2(error)        = Error                   : 
+#    7|     mu7_3(int)         = Store[x]                : &:r7_1, r7_2
+#    8|     r8_1(glval<error>) = Error                   : 
+#    8|     r8_2(error)        = Load[?]                 : &:r8_1, ~m?
+#    8|     r8_3(glval<int>)   = VariableAddress[x]      : 
+#    8|     mu8_4(int)         = Store[x]                : &:r8_3, r8_2
+#    9|     v9_1(void)         = NoOp                    : 
+#    5|     v5_4(void)         = ReturnVoid              : 
+#    5|     v5_5(void)         = AliasedUse              : ~m?
+#    5|     v5_6(void)         = ExitFunction            : 
 
 clang.cpp:
 #    5| int* globalIntAddress()
