Merge pull request #16138 from jketema/coroutine3

C++: Update expected test results
github · Apr 10, 2024 · b9b2aa3 · b9b2aa3
2 parents c4e674b + 46c44b4
commit b9b2aa3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -506,8 +506,7 @@ private module IRDeclarationEntries {
    * An entity that represents a declaration entry in the database.
    *
    * This class exists to work around the fact that `DeclStmt`s in some cases
-   * do not have `DeclarationEntry`s. Currently, this is the case for:
-   * - `DeclStmt`s in template instantiations.
+   * do not have `DeclarationEntry`s in older databases.
    *
    * So instead, the IR works with `IRDeclarationEntry`s that synthesize missing
    * `DeclarationEntry`s when there is no result for `DeclStmt::getDeclarationEntry`.

diff --git a/cpp/ql/test/library-tests/CPP-205/elements.expected b/cpp/ql/test/library-tests/CPP-205/elements.expected
@@ -10,7 +10,9 @@
 | CPP-205.cpp:2:15:5:1 | { ... } | isFromUninstantiatedTemplate(fn) |
 | CPP-205.cpp:3:3:3:33 | declaration | isFromTemplateInstantiation(fn) |
 | CPP-205.cpp:3:3:3:33 | declaration | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:15:3:15 | declaration of y | isFromTemplateInstantiation(fn) |
 | CPP-205.cpp:3:15:3:15 | declaration of y | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:15:3:15 | y | isFromTemplateInstantiation(fn) |
 | CPP-205.cpp:3:15:3:15 | y | isFromUninstantiatedTemplate(fn) |
 | CPP-205.cpp:3:17:3:31 | 5 | isFromTemplateInstantiation(fn) |
 | CPP-205.cpp:4:3:4:11 | return ... | isFromTemplateInstantiation(fn) |

diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -15440,6 +15440,8 @@ ir.cpp:
 # 1911|         Type = [CTypedefType,NestedTypedefType] pointer
 # 1911|   getEntryPoint(): [BlockStmt] { ... }
 # 1912|     getStmt(0): [DeclStmt] declaration
+# 1912|       getDeclarationEntry(0): [TypeDeclarationEntry] declaration of _Res
+# 1912|           Type = [CTypedefType,LocalTypedefType] _Res
 # 1913|     getStmt(1): [ReturnStmt] return ...
 # 1913|       getExpr(): [VariableAccess] p
 # 1913|           Type = [CTypedefType,NestedTypedefType] pointer
@@ -15547,6 +15549,10 @@ ir.cpp:
 # 1924|   <params>: 
 # 1924|   getEntryPoint(): [BlockStmt] { ... }
 # 1925|     getStmt(0): [DeclStmt] declaration
+# 1925|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
+# 1925|           Type = [ArrayType] int[10]
+# 1925|       getDeclarationEntry(1): [VariableDeclarationEntry] definition of y
+# 1925|           Type = [ArrayType] int[10]
 # 1926|     getStmt(1): [ExprStmt] ExprStmt
 # 1926|       getExpr(): [AssignExpr] ... = ...
 # 1926|           Type = [IntType] int
@@ -15642,7 +15648,11 @@ ir.cpp:
 # 1939|   <params>: 
 # 1939|   getEntryPoint(): [BlockStmt] { ... }
 # 1940|     getStmt(0): [DeclStmt] declaration
+# 1940|       getDeclarationEntry(0): [VariableDeclarationEntry] declaration of g
+# 1940|           Type = [IntType] int
 # 1941|     getStmt(1): [DeclStmt] declaration
+# 1941|       getDeclarationEntry(0): [FunctionDeclarationEntry] declaration of z
+# 1941|           Type = [IntType] int
 # 1942|     getStmt(2): [ReturnStmt] return ...
 # 1942|       getExpr(): [VariableAccess] g
 # 1942|           Type = [IntType] int

diff --git a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -9771,8 +9771,8 @@
 | ir.cpp:1924:13:1924:13 | Load | m1928_9 |
 | ir.cpp:1924:13:1924:13 | SideEffect | m1924_3 |
 | ir.cpp:1924:13:1924:13 | SideEffect | m1924_8 |
-| ir.cpp:1925:13:1925:29 | Address | &:r1925_1 |
-| ir.cpp:1925:13:1925:29 | Address | &:r1925_3 |
+| ir.cpp:1925:17:1925:17 | Address | &:r1925_1 |
+| ir.cpp:1925:24:1925:24 | Address | &:r1925_3 |
 | ir.cpp:1926:13:1926:14 | Address | &:r1926_4 |
 | ir.cpp:1926:13:1926:19 | ChiPartial | partial:m1926_5 |
 | ir.cpp:1926:13:1926:19 | ChiTotal | total:m1925_2 |