Update tests for extractor changes with ctors

2026-04-30 19:26:02 +02:00 · 2020-08-26 14:17:24 +01:00
parent 9296a12a91
commit 795bf0d93c
23 changed files with 672 additions and 557 deletions
--- a/cpp/ql/test/examples/expressions/PrintAST.expected
+++ b/cpp/ql/test/examples/expressions/PrintAST.expected
@@ -350,6 +350,8 @@ Conversion4.c:
 #    2|                 ValueCategory = prvalue
 #    3|     1: [ReturnStmt] return ...
 DestructorCall.cpp:
+#    1| [Constructor] void C::C()
+#    1|   params: 
 #    3| [Destructor] void C::~C()
 #    3|   params: 
 #    3|   body: [BlockStmt] { ... }
--- a/cpp/ql/test/header-variant-tests/deduplication/functions.expected
+++ b/cpp/ql/test/header-variant-tests/deduplication/functions.expected
@@ -7,6 +7,8 @@
 | foo.h:1:13:1:15 | foo | Function | 1 | <none> |
 | foo.h:1:13:1:15 | foo | MemberFunction | 1 | C |
 | foo.h:1:13:1:15 | foo | MemberFunction | 1 | C |
+| main2.cpp:7:7:7:7 | C | MemberFunction | 0 | C |
+| main2.cpp:7:7:7:7 | C | MemberFunction | 0 | C |
 | main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |
 | main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |
 | main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |
--- a/cpp/ql/test/library-tests/access/canAccessMember/canAccessMember.expected
+++ b/cpp/ql/test/library-tests/access/canAccessMember/canAccessMember.expected
@@ -8,89 +8,143 @@
 | direct_friend::D::f | Can access D::f |
 | direct_friend::D::f | Can access D::operator= |
 | direct_friend::D::f | Can access D::x |
+| field_and_base::P::f | Can access B::B |
 | field_and_base::P::f | Can access B::operator= |
+| field_and_base::P::f | Can access P::B |
+| field_and_base::P::f | Can access P::P |
 | field_and_base::P::f | Can access P::f |
 | field_and_base::P::f | Can access P::fieldB |
 | field_and_base::P::f | Can access P::m |
 | field_and_base::P::f | Can access P::m_static |
 | field_and_base::P::f | Can access P::operator= |
+| friend_class::B::fun | Can access B::B |
 | friend_class::B::fun | Can access B::a |
 | friend_class::B::fun | Can access B::b |
 | friend_class::B::fun | Can access B::fun |
 | friend_class::B::fun | Can access B::operator= |
+| friend_class::B::fun | Can access C::C |
 | friend_class::B::fun | Can access C::operator= |
+| friend_class::B::fun | Can access D1::D1 |
 | friend_class::B::fun | Can access D1::operator= |
+| friend_class::B::fun | Can access D2::D2 |
 | friend_class::B::fun | Can access D2::operator= |
+| friend_class::C::fun | Can access B::B |
 | friend_class::C::fun | Can access B::operator= |
+| friend_class::C::fun | Can access C::B |
+| friend_class::C::fun | Can access C::C |
 | friend_class::C::fun | Can access C::fun |
 | friend_class::C::fun | Can access C::operator= |
 | friend_class::C::fun | Can access C::x |
 | friend_class::C::fun | Can access C::y |
+| friend_class::C::fun | Can access D1::D1 |
 | friend_class::C::fun | Can access D1::operator= |
+| friend_class::C::fun | Can access D2::D2 |
 | friend_class::C::fun | Can access D2::operator= |
+| friend_class::D1::fun | Can access B::B |
 | friend_class::D1::fun | Can access B::a |
 | friend_class::D1::fun | Can access B::b |
 | friend_class::D1::fun | Can access B::fun |
 | friend_class::D1::fun | Can access B::operator= |
+| friend_class::D1::fun | Can access C::C |
 | friend_class::D1::fun | Can access C::operator= |
+| friend_class::D1::fun | Can access D1::C |
+| friend_class::D1::fun | Can access D1::D1 |
 | friend_class::D1::fun | Can access D1::fun |
 | friend_class::D1::fun | Can access D1::operator= |
+| friend_class::D1::fun | Can access D2::D2 |
 | friend_class::D1::fun | Can access D2::operator= |
+| friend_class::D2::fun | Can access B::B |
 | friend_class::D2::fun | Can access B::a |
 | friend_class::D2::fun | Can access B::b |
 | friend_class::D2::fun | Can access B::fun |
 | friend_class::D2::fun | Can access B::operator= |
+| friend_class::D2::fun | Can access C::C |
 | friend_class::D2::fun | Can access C::operator= |
+| friend_class::D2::fun | Can access D1::D1 |
 | friend_class::D2::fun | Can access D1::operator= |
+| friend_class::D2::fun | Can access D2::B |
+| friend_class::D2::fun | Can access D2::D2 |
 | friend_class::D2::fun | Can access D2::a |
 | friend_class::D2::fun | Can access D2::b |
 | friend_class::D2::fun | Can access D2::fun |
 | friend_class::D2::fun | Can access D2::operator= |
 | friend_fun::fun1 | Can access A::operator= |
+| friend_fun::fun1 | Can access B::B |
 | friend_fun::fun1 | Can access B::operator= |
 | friend_fun::fun2 | Can access A::operator= |
+| friend_fun::fun2 | Can access B::B |
 | friend_fun::fun2 | Can access B::operator= |
 | friend_fun::fun2 | Can access B::x |
 | friend_fun::fun2 | Can access B::y |
+| mixed::B::fun | Can access A::A |
 | mixed::B::fun | Can access A::operator= |
+| mixed::B::fun | Can access B::A |
+| mixed::B::fun | Can access B::B |
 | mixed::B::fun | Can access B::fun |
 | mixed::B::fun | Can access B::operator= |
+| mixed::B::fun | Can access C::C |
 | mixed::B::fun | Can access C::operator= |
+| mixed::B::fun | Can access D::C |
+| mixed::B::fun | Can access D::D |
 | mixed::B::fun | Can access D::operator= |
+| mixed::C::fun | Can access A::A |
 | mixed::C::fun | Can access A::operator= |
+| mixed::C::fun | Can access B::B |
 | mixed::C::fun | Can access B::operator= |
+| mixed::C::fun | Can access C::B |
+| mixed::C::fun | Can access C::C |
 | mixed::C::fun | Can access C::fun |
 | mixed::C::fun | Can access C::operator= |
+| mixed::C::fun | Can access D::B |
+| mixed::C::fun | Can access D::C |
+| mixed::C::fun | Can access D::D |
 | mixed::C::fun | Can access D::fun |
 | mixed::C::fun | Can access D::operator= |
+| mixed::D::fun | Can access A::A |
 | mixed::D::fun | Can access A::operator= |
+| mixed::D::fun | Can access B::B |
 | mixed::D::fun | Can access B::operator= |
+| mixed::D::fun | Can access C::B |
+| mixed::D::fun | Can access C::C |
 | mixed::D::fun | Can access C::operator= |
+| mixed::D::fun | Can access D::B |
+| mixed::D::fun | Can access D::C |
+| mixed::D::fun | Can access D::D |
 | mixed::D::fun | Can access D::fun |
 | mixed::D::fun | Can access D::operator= |
 | protected_derived::BP::f | Can access B::m |
 | protected_derived::BP::f | Can access B::operator= |
+| protected_derived::BP::f | Can access BN::BN |
 | protected_derived::BP::f | Can access BN::operator= |
+| protected_derived::BP::f | Can access BP::BP |
 | protected_derived::BP::f | Can access BP::f |
 | protected_derived::BP::f | Can access BP::m |
 | protected_derived::BP::f | Can access BP::operator= |
+| protected_derived::BP::f | Can access BPNprot::BPNprot |
 | protected_derived::BP::f | Can access BPNprot::operator= |
+| protected_derived::BP::f | Can access BPNpub::BP |
+| protected_derived::BP::f | Can access BPNpub::BPNpub |
 | protected_derived::BP::f | Can access BPNpub::f |
 | protected_derived::BP::f | Can access BPNpub::m |
 | protected_derived::BP::f | Can access BPNpub::operator= |
+| protected_virtual::P::f | Can access B::B |
 | protected_virtual::P::f | Can access B::operator= |
 | protected_virtual::P::f | Can access Nprot::Nprot |
 | protected_virtual::P::f | Can access Nprot::operator= |
+| protected_virtual::P::f | Can access Npub::B |
 | protected_virtual::P::f | Can access Npub::Npub |
 | protected_virtual::P::f | Can access Npub::m |
 | protected_virtual::P::f | Can access Npub::operator= |
+| protected_virtual::P::f | Can access P::B |
 | protected_virtual::P::f | Can access P::P |
 | protected_virtual::P::f | Can access P::f |
 | protected_virtual::P::f | Can access P::m |
 | protected_virtual::P::f | Can access P::operator= |
 | simple::Derived::castme | Can access Base::operator= |
+| simple::Derived::castme | Can access Derived::Derived |
 | simple::Derived::castme | Can access Derived::castme |
 | simple::Derived::castme | Can access Derived::operator= |
 | simple::top | Can access Base::operator= |
+| simple::top | Can access Derived::Derived |
 | simple::top | Can access Derived::castme |
 | simple::top | Can access Derived::operator= |
--- a/cpp/ql/test/library-tests/declaration/IsMember.expected
+++ b/cpp/ql/test/library-tests/declaration/IsMember.expected
@@ -3,6 +3,7 @@
 | declaration.cpp:32:7:32:7 | operator= |
 | declaration.cpp:32:7:32:7 | operator= |
 | declaration.cpp:34:7:34:14 | myField0 |
+| declaration.cpp:36:9:36:9 | MyNestedClass |
 | declaration.cpp:36:9:36:9 | operator= |
 | declaration.cpp:36:9:36:9 | operator= |
 | declaration.cpp:36:9:36:21 | MyNestedClass |
@@ -28,6 +29,7 @@
 | declaration.cpp:100:7:100:7 | operator= |
 | declaration.cpp:100:7:100:7 | operator= |
 | declaration.cpp:102:7:102:14 | myField1 |
+| declaration.cpp:104:9:104:9 | MyNestedClass |
 | declaration.cpp:104:9:104:9 | operator= |
 | declaration.cpp:104:9:104:9 | operator= |
 | declaration.cpp:104:9:104:21 | MyNestedClass |
--- a/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected
+++ b/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected
@@ -27,6 +27,7 @@
 | test.cpp:20:6:20:20 | definition of tmplProtoAndDef |
 | test.cpp:20:24:20:24 | declaration of t |
 | test.cpp:20:24:20:24 | definition of t |
+| test.cpp:22:7:22:7 | declaration of Cl |
 | test.cpp:22:7:22:7 | declaration of operator= |
 | test.cpp:22:7:22:7 | declaration of operator= |
 | test.cpp:22:7:22:8 | definition of Cl |
@@ -75,6 +76,8 @@
 | test.cpp:67:7:67:7 | declaration of operator= |
 | test.cpp:67:7:67:7 | declaration of operator= |
 | test.cpp:67:7:67:7 | declaration of operator= |
+| test.cpp:67:7:67:7 | definition of tmplInstantiatedClass |
+| test.cpp:67:7:67:7 | definition of tmplInstantiatedClass |
 | test.cpp:67:7:67:27 | definition of tmplInstantiatedClass<T> |
 | test.cpp:68:7:68:7 | definition of t |
 | test.cpp:68:7:68:7 | definition of t |
--- a/cpp/ql/test/library-tests/fun_decl/test.expected
+++ b/cpp/ql/test/library-tests/fun_decl/test.expected
@@ -1,4 +1,5 @@
 | compile1.cpp:3:6:3:10 | func1 |
+| compile2.cpp:3:7:3:7 | classA |
 | compile2.cpp:3:7:3:7 | operator= |
 | compile2.cpp:5:2:5:8 | ~classA |
 | compile2.cpp:8:9:8:19 | create_an_a |
--- a/cpp/ql/test/library-tests/functions/functions/Functions1.expected
+++ b/cpp/ql/test/library-tests/functions/functions/Functions1.expected
@@ -1,3 +1,4 @@
+| ODASA-5186.cpp:4:8:4:8 | MyClass | MyClass |  | declaration:ODASA-5186.cpp:4:8:4:8, definition:ODASA-5186.cpp:4:8:4:8 |
 | ODASA-5186.cpp:4:8:4:8 | operator= | operator= | MyClass<int> && p#0 | declaration:ODASA-5186.cpp:4:8:4:8 |
 | ODASA-5186.cpp:4:8:4:8 | operator= | operator= | const MyClass<int> & p#0 | declaration:ODASA-5186.cpp:4:8:4:8 |
 | ODASA-5186.cpp:5:8:5:8 | operator== | operator== | const MyClass<int> & other | declaration:ODASA-5186.cpp:5:8:5:8, definition:ODASA-5186.cpp:5:8:5:8 |
@@ -13,6 +14,7 @@
 | functions.cpp:8:7:8:8 | af | af |  | declaration:functions.cpp:8:7:8:8, definition:functions.cpp:8:7:8:8 |
 | functions.cpp:11:7:11:8 | ag | ag |  | declaration:functions.cpp:11:7:11:8 |
 | functions.cpp:14:6:14:6 | g | g |  | TopLevelFunction, declaration:functions.cpp:14:6:14:6, declaration:functions.cpp:5:6:5:6, definition:functions.cpp:14:6:14:6, isTopLevel |
+| functions.cpp:19:7:19:7 | Name | Name |  | declaration:functions.cpp:19:7:19:7 |
 | functions.cpp:19:7:19:7 | operator= | operator= | Name && p#0 | declaration:functions.cpp:19:7:19:7 |
 | functions.cpp:19:7:19:7 | operator= | operator= | const Name & p#0 | declaration:functions.cpp:19:7:19:7 |
 | functions.cpp:23:7:23:7 | Table | Table | const Table & p#0 | declaration:functions.cpp:23:7:23:7 |
--- a/cpp/ql/test/library-tests/functions/functions/Functions2.expected
+++ b/cpp/ql/test/library-tests/functions/functions/Functions2.expected
@@ -1,4 +1,5 @@
 | ODASA-5186.cpp:4:8:4:14 | MyClass<T> | Class | ODASA-5186.cpp:5:8:5:17 | operator== |  |
+| ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | MyClass | Constructor, NoArgConstructor, getAConstructor() |
 | ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | operator= |  |
 | ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | operator= |  |
 | ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:5:8:5:8 | operator== |  |
@@ -10,6 +11,7 @@
 | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:7:8:7:8 | operator= |  |
 | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:8:7:8:8 | af |  |
 | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:11:7:11:8 | ag |  |
+| functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | Name | Constructor, NoArgConstructor, getAConstructor() |
 | functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | operator= |  |
 | functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | operator= |  |
 | functions.cpp:23:7:23:11 | Table | Class | functions.cpp:23:7:23:7 | Table | Constructor, CopyConstructor, getAConstructor() |
--- a/cpp/ql/test/library-tests/identifiers/qualified_names/unnamed.expected
+++ b/cpp/ql/test/library-tests/identifiers/qualified_names/unnamed.expected
@@ -1,6 +1,7 @@
 | qualifiedNames.cpp:3:25:3:27 | p#0 |
 | qualifiedNames.cpp:4:25:4:28 | p#0 |
 | qualifiedNames.cpp:18:18:18:31 | Nested's friend |
+| qualifiedNames.cpp:26:9:26:9 | LocalClass |
 | qualifiedNames.cpp:26:9:26:9 | operator= |
 | qualifiedNames.cpp:26:9:26:9 | operator= |
 | qualifiedNames.cpp:26:9:26:18 | LocalClass |
--- a/cpp/ql/test/library-tests/instantiations/test.expected
+++ b/cpp/ql/test/library-tests/instantiations/test.expected
@@ -2,6 +2,7 @@
 | file://:0:0:0:0 | operator new |
 | file://:0:0:0:0 | operator= |
 | file://:0:0:0:0 | operator= |
+| test.cpp:2:7:2:7 | A |
 | test.cpp:2:7:2:7 | operator= |
 | test.cpp:2:19:2:20 | ~A |
 | test.cpp:4:7:4:7 | X |
--- a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
+++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
@@ -6,6 +6,8 @@
 | file://:0:0:0:0 | p#0 | false |
 | test.cpp:0:0:0:0 | test.cpp | false |
 | test.cpp:2:1:2:61 | #define FOO class S{int i; void f(void) { int j; return; } }; | false |
+| test.cpp:4:1:4:1 | S | false |
+| test.cpp:4:1:4:1 | declaration of S | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | operator= | false |
--- a/cpp/ql/test/library-tests/members/getters/members.expected
+++ b/cpp/ql/test/library-tests/members/getters/members.expected
@@ -8,6 +8,7 @@
 | test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D<T>(T) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() |
 | test.cpp:2:7:2:7 | C | test.cpp:10:10:10:12 | f_C | C::f_C() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
 | test.cpp:2:7:2:7 | C | test.cpp:11:10:11:14 | f_C_D | C::f_C_D() | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() |
+| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | D | D::D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
 | test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(D &&) | getAMember(), getAMember(5), getAMemberFunction(), getCanonicalMember(5), getDeclaringType() |
 | test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(const D &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
 | test.cpp:14:7:14:7 | D | test.cpp:17:10:17:10 | f_template_C_D | D::f_template_C_D<double>(double) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() |
--- a/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected
+++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected
@@ -21,8 +21,10 @@
 | scopes.cpp:2:7:2:7 | A | Class | scopes.cpp:2:7:2:7 | operator= |  |
 | scopes.cpp:7:7:7:7 | B | Class | scopes.cpp:7:7:7:7 | operator= |  |
 | scopes.cpp:7:7:7:7 | B | Class | scopes.cpp:7:7:7:7 | operator= |  |
+| scopes.cpp:11:7:11:7 | C | Class | scopes.cpp:11:7:11:7 | C |  |
 | scopes.cpp:11:7:11:7 | C | Class | scopes.cpp:11:7:11:7 | operator= |  |
 | scopes.cpp:11:7:11:7 | C | Class | scopes.cpp:11:7:11:7 | operator= |  |
+| scopes.cpp:15:7:15:7 | D | Class | scopes.cpp:15:7:15:7 | D |  |
 | scopes.cpp:15:7:15:7 | D | Class | scopes.cpp:15:7:15:7 | operator= |  |
 | scopes.cpp:15:7:15:7 | D | Class | scopes.cpp:15:7:15:7 | operator= |  |
 | scopes.cpp:15:7:15:7 | D | Class | scopes.cpp:21:7:21:10 | E | NestedClass |
@@ -32,6 +34,7 @@
 | scopes.cpp:21:7:21:10 | E | NestedClass | scopes.cpp:31:7:31:13 | F | NestedClass |
 | scopes.cpp:25:8:25:8 | G | NestedClass | scopes.cpp:25:8:25:8 | operator= |  |
 | scopes.cpp:25:8:25:8 | G | NestedClass | scopes.cpp:25:8:25:8 | operator= |  |
+| scopes.cpp:31:7:31:13 | F | NestedClass | scopes.cpp:31:13:31:13 | F |  |
 | scopes.cpp:31:7:31:13 | F | NestedClass | scopes.cpp:31:13:31:13 | operator= |  |
 | scopes.cpp:31:7:31:13 | F | NestedClass | scopes.cpp:31:13:31:13 | operator= |  |
 | scopes.cpp:31:7:31:13 | F | NestedClass | scopes.cpp:32:8:32:27 | doubleNestedFunction |  |
@@ -39,6 +42,7 @@
 | scopes.cpp:46:8:46:8 | S | Class | scopes.cpp:46:8:46:8 | operator= |  |
 | scopes.cpp:46:8:46:8 | S | Class | scopes.cpp:47:7:47:8 | af |  |
 | scopes.cpp:46:8:46:8 | S | Class | scopes.cpp:50:7:50:8 | ag |  |
+| scopes.cpp:58:7:58:10 | Name | Class | scopes.cpp:58:7:58:7 | Name |  |
 | scopes.cpp:58:7:58:10 | Name | Class | scopes.cpp:58:7:58:7 | operator= |  |
 | scopes.cpp:58:7:58:10 | Name | Class | scopes.cpp:58:7:58:7 | operator= |  |
 | scopes.cpp:58:7:58:10 | Name | Class | scopes.cpp:59:14:59:14 | s |  |
@@ -59,9 +63,11 @@
 | scopes.cpp:74:11:74:13 | One | Namespace | scopes.cpp:95:8:95:8 | I | Class |
 | scopes.cpp:77:8:77:8 | H<T> | Class | scopes.cpp:76:18:76:18 | T |  |
 | scopes.cpp:77:8:77:8 | H<T> | Class | scopes.cpp:79:5:79:5 | t |  |
+| scopes.cpp:77:8:77:8 | H<long> | Class | scopes.cpp:77:8:77:8 | H |  |
 | scopes.cpp:77:8:77:8 | H<long> | Class | scopes.cpp:77:8:77:8 | operator= |  |
 | scopes.cpp:77:8:77:8 | H<long> | Class | scopes.cpp:77:8:77:8 | operator= |  |
 | scopes.cpp:77:8:77:8 | H<long> | Class | scopes.cpp:79:5:79:5 | t |  |
+| scopes.cpp:77:8:77:8 | H<short> | Class | scopes.cpp:77:8:77:8 | H |  |
 | scopes.cpp:77:8:77:8 | H<short> | Class | scopes.cpp:77:8:77:8 | operator= |  |
 | scopes.cpp:77:8:77:8 | H<short> | Class | scopes.cpp:77:8:77:8 | operator= |  |
 | scopes.cpp:77:8:77:8 | H<short> | Class | scopes.cpp:79:5:79:5 | t |  |
--- a/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected
+++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected
@@ -4,32 +4,38 @@
 | scopes.cpp:2:7:2:7 | operator= |  | scopes.cpp:2:7:2:7 | A | 2 |
 | scopes.cpp:7:7:7:7 | operator= |  | scopes.cpp:7:7:7:7 | B | 2 |
 | scopes.cpp:7:7:7:7 | operator= |  | scopes.cpp:7:7:7:7 | B | 2 |
-| scopes.cpp:11:7:11:7 | operator= |  | scopes.cpp:11:7:11:7 | C | 2 |
-| scopes.cpp:11:7:11:7 | operator= |  | scopes.cpp:11:7:11:7 | C | 2 |
-| scopes.cpp:15:7:15:7 | operator= |  | scopes.cpp:15:7:15:7 | D | 3 |
-| scopes.cpp:15:7:15:7 | operator= |  | scopes.cpp:15:7:15:7 | D | 3 |
+| scopes.cpp:11:7:11:7 | C | Constructor | scopes.cpp:11:7:11:7 | C | 3 |
+| scopes.cpp:11:7:11:7 | operator= |  | scopes.cpp:11:7:11:7 | C | 3 |
+| scopes.cpp:11:7:11:7 | operator= |  | scopes.cpp:11:7:11:7 | C | 3 |
+| scopes.cpp:15:7:15:7 | D | Constructor | scopes.cpp:15:7:15:7 | D | 4 |
+| scopes.cpp:15:7:15:7 | operator= |  | scopes.cpp:15:7:15:7 | D | 4 |
+| scopes.cpp:15:7:15:7 | operator= |  | scopes.cpp:15:7:15:7 | D | 4 |
 | scopes.cpp:21:10:21:10 | operator= |  | scopes.cpp:21:7:21:10 | E | 4 |
 | scopes.cpp:21:10:21:10 | operator= |  | scopes.cpp:21:7:21:10 | E | 4 |
 | scopes.cpp:25:8:25:8 | operator= |  | scopes.cpp:25:8:25:8 | G | 2 |
 | scopes.cpp:25:8:25:8 | operator= |  | scopes.cpp:25:8:25:8 | G | 2 |
-| scopes.cpp:31:13:31:13 | operator= |  | scopes.cpp:31:7:31:13 | F | 3 |
-| scopes.cpp:31:13:31:13 | operator= |  | scopes.cpp:31:7:31:13 | F | 3 |
-| scopes.cpp:32:8:32:27 | doubleNestedFunction |  | scopes.cpp:31:7:31:13 | F | 3 |
+| scopes.cpp:31:13:31:13 | F | Constructor | scopes.cpp:31:7:31:13 | F | 4 |
+| scopes.cpp:31:13:31:13 | operator= |  | scopes.cpp:31:7:31:13 | F | 4 |
+| scopes.cpp:31:13:31:13 | operator= |  | scopes.cpp:31:7:31:13 | F | 4 |
+| scopes.cpp:32:8:32:27 | doubleNestedFunction |  | scopes.cpp:31:7:31:13 | F | 4 |
 | scopes.cpp:46:8:46:8 | operator= |  | scopes.cpp:46:8:46:8 | S | 4 |
 | scopes.cpp:46:8:46:8 | operator= |  | scopes.cpp:46:8:46:8 | S | 4 |
 | scopes.cpp:47:7:47:8 | af |  | scopes.cpp:46:8:46:8 | S | 4 |
 | scopes.cpp:50:7:50:8 | ag |  | scopes.cpp:46:8:46:8 | S | 4 |
-| scopes.cpp:58:7:58:7 | operator= |  | scopes.cpp:58:7:58:10 | Name | 3 |
-| scopes.cpp:58:7:58:7 | operator= |  | scopes.cpp:58:7:58:10 | Name | 3 |
+| scopes.cpp:58:7:58:7 | Name | Constructor | scopes.cpp:58:7:58:10 | Name | 4 |
+| scopes.cpp:58:7:58:7 | operator= |  | scopes.cpp:58:7:58:10 | Name | 4 |
+| scopes.cpp:58:7:58:7 | operator= |  | scopes.cpp:58:7:58:10 | Name | 4 |
 | scopes.cpp:62:7:62:7 | Table | Constructor | scopes.cpp:62:7:62:11 | Table | 8 |
 | scopes.cpp:62:7:62:7 | operator= |  | scopes.cpp:62:7:62:11 | Table | 8 |
 | scopes.cpp:66:3:66:7 | Table | Constructor | scopes.cpp:62:7:62:11 | Table | 8 |
 | scopes.cpp:67:3:67:8 | ~Table |  | scopes.cpp:62:7:62:11 | Table | 8 |
 | scopes.cpp:68:9:68:14 | lookup |  | scopes.cpp:62:7:62:11 | Table | 8 |
 | scopes.cpp:69:8:69:13 | insert |  | scopes.cpp:62:7:62:11 | Table | 8 |
-| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<long> | 3 |
-| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<long> | 3 |
-| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<short> | 3 |
-| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<short> | 3 |
+| scopes.cpp:77:8:77:8 | H | Constructor | scopes.cpp:77:8:77:8 | H<long> | 4 |
+| scopes.cpp:77:8:77:8 | H | Constructor | scopes.cpp:77:8:77:8 | H<short> | 4 |
+| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<long> | 4 |
+| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<long> | 4 |
+| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<short> | 4 |
+| scopes.cpp:77:8:77:8 | operator= |  | scopes.cpp:77:8:77:8 | H<short> | 4 |
 | scopes.cpp:95:8:95:8 | operator= |  | scopes.cpp:95:8:95:8 | I | 3 |
 | scopes.cpp:95:8:95:8 | operator= |  | scopes.cpp:95:8:95:8 | I | 3 |
--- a/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected
+++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected
@@ -6,14 +6,17 @@
 | scopes.cpp:2:7:2:7 | operator= |  | 1 | 1 |
 | scopes.cpp:7:7:7:7 | operator= |  | 1 | 1 |
 | scopes.cpp:7:7:7:7 | operator= |  | 1 | 1 |
+| scopes.cpp:11:7:11:7 | C |  | 1 | 1 |
 | scopes.cpp:11:7:11:7 | operator= |  | 1 | 1 |
 | scopes.cpp:11:7:11:7 | operator= |  | 1 | 1 |
+| scopes.cpp:15:7:15:7 | D |  | 1 | 1 |
 | scopes.cpp:15:7:15:7 | operator= |  | 1 | 1 |
 | scopes.cpp:15:7:15:7 | operator= |  | 1 | 1 |
 | scopes.cpp:21:10:21:10 | operator= |  | 1 | 1 |
 | scopes.cpp:21:10:21:10 | operator= |  | 1 | 1 |
 | scopes.cpp:25:8:25:8 | operator= |  | 1 | 1 |
 | scopes.cpp:25:8:25:8 | operator= |  | 1 | 1 |
+| scopes.cpp:31:13:31:13 | F |  | 1 | 1 |
 | scopes.cpp:31:13:31:13 | operator= |  | 1 | 1 |
 | scopes.cpp:31:13:31:13 | operator= |  | 1 | 1 |
 | scopes.cpp:32:8:32:27 | doubleNestedFunction |  | 1 | 1 |
@@ -23,6 +26,7 @@
 | scopes.cpp:47:7:47:8 | af |  | 1 | 1 |
 | scopes.cpp:50:7:50:8 | ag |  | 1 | 1 |
 | scopes.cpp:53:6:53:6 | g | isTopLevel() | 1 | 1 |
+| scopes.cpp:58:7:58:7 | Name |  | 1 | 1 |
 | scopes.cpp:58:7:58:7 | operator= |  | 1 | 1 |
 | scopes.cpp:58:7:58:7 | operator= |  | 1 | 1 |
 | scopes.cpp:62:7:62:7 | Table |  | 1 | 1 |
@@ -32,6 +36,8 @@
 | scopes.cpp:68:9:68:14 | lookup |  | 1 | 1 |
 | scopes.cpp:69:8:69:13 | insert |  | 1 | 1 |
 | scopes.cpp:72:16:72:21 | strlen | isTopLevel() | 1 | 1 |
+| scopes.cpp:77:8:77:8 | H |  | 1 | 0 |
+| scopes.cpp:77:8:77:8 | H |  | 1 | 0 |
 | scopes.cpp:77:8:77:8 | operator= |  | 1 | 0 |
 | scopes.cpp:77:8:77:8 | operator= |  | 1 | 0 |
 | scopes.cpp:77:8:77:8 | operator= |  | 1 | 0 |
--- a/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected
+++ b/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected
@@ -25,12 +25,16 @@
 | cpp.cpp:30:5:30:7 | Bar | int -> int -> int -> int -> void | true |
 | cpp.cpp:31:5:31:7 | Bar | int -> int -> int -> int -> int -> void | false |
 | cpp.cpp:32:5:32:7 | Bar | int -> int -> int -> int -> int -> int -> void | false |
+| cpp.cpp:35:7:35:7 | PurelyDestructible | void | false |
 | cpp.cpp:35:7:35:7 | operator= | const PurelyDestructible & -> PurelyDestructible & | false |
 | cpp.cpp:37:5:37:23 | ~PurelyDestructible | void | true |
+| cpp.cpp:40:7:40:7 | ImpurelyDestructible | void | false |
 | cpp.cpp:40:7:40:7 | operator= | const ImpurelyDestructible & -> ImpurelyDestructible & | false |
 | cpp.cpp:42:5:42:25 | ~ImpurelyDestructible | void | false |
+| cpp.cpp:45:7:45:7 | SuperPurelyDestructible | void | false |
 | cpp.cpp:45:7:45:7 | operator= | const SuperPurelyDestructible & -> SuperPurelyDestructible & | false |
 | cpp.cpp:47:5:47:28 | ~SuperPurelyDestructible | void | true |
+| cpp.cpp:50:7:50:7 | SuperImpurelyDestructible | void | false |
 | cpp.cpp:50:7:50:7 | operator= | const SuperImpurelyDestructible & -> SuperImpurelyDestructible & | false |
 | cpp.cpp:52:5:52:30 | ~SuperImpurelyDestructible | void | false |
 | cpp.cpp:55:7:55:7 | operator= | const someClass & -> someClass & | false |
--- a/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected
+++ b/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected
@@ -24,6 +24,7 @@
 | copy.cpp:38:8:38:16 | operator= |  | defaulted |
 | copy.cpp:41:9:41:9 | operator= |  |  |
 | copy.cpp:46:5:46:7 | Sub | deleted | defaulted |
+| copy.cpp:49:9:49:9 | HasPointer |  |  |
 | copy.cpp:49:9:49:9 | operator= |  |  |
 | copy.cpp:49:9:49:9 | operator= |  |  |
 | copy.cpp:54:9:54:9 | HasArray | deleted |  |
@@ -35,6 +36,7 @@
 | copy.cpp:59:9:59:9 | operator= |  |  |
 | copy.cpp:59:9:59:9 | operator= |  |  |
 | copy.cpp:67:9:67:9 | Wrapper |  |  |
+| copy.cpp:67:9:67:9 | Wrapper |  |  |
 | copy.cpp:67:9:67:9 | Wrapper | deleted |  |
 | copy.cpp:67:9:67:9 | Wrapper | deleted |  |
 | copy.cpp:67:9:67:9 | operator= |  |  |
@@ -46,12 +48,14 @@
 | copy.cpp:72:9:72:9 | NotCopyable | deleted |  |
 | copy.cpp:72:9:72:9 | NotCopyable | deleted |  |
 | copy.cpp:72:9:72:9 | operator= | deleted |  |
+| copy.cpp:76:9:76:9 | CopyableComposition |  |  |
 | copy.cpp:76:9:76:9 | operator= |  |  |
 | copy.cpp:76:9:76:9 | operator= |  |  |
 | copy.cpp:80:9:80:9 | NotCopyableComposition |  |  |
 | copy.cpp:80:9:80:9 | NotCopyableComposition | deleted |  |
 | copy.cpp:80:9:80:9 | NotCopyableComposition | deleted |  |
 | copy.cpp:80:9:80:9 | operator= | deleted |  |
+| copy.cpp:84:9:84:9 | CopyableInheritance |  |  |
 | copy.cpp:84:9:84:9 | operator= |  |  |
 | copy.cpp:84:9:84:9 | operator= |  |  |
 | copy.cpp:86:9:86:9 | NotCopyableInheritance |  |  |
@@ -64,11 +68,13 @@
 | copy.cpp:91:11:91:11 | operator= |  |  |
 | copy.cpp:95:9:95:9 | operator= |  |  |
 | copy.cpp:95:9:95:9 | operator= |  |  |
+| copy.cpp:100:9:100:9 | Derived |  |  |
 | copy.cpp:100:9:100:9 | operator= |  |  |
 | copy.cpp:100:9:100:9 | operator= |  |  |
 | copy.cpp:106:9:106:9 | MoveCtor | deleted |  |
 | copy.cpp:106:9:106:9 | operator= | deleted |  |
 | copy.cpp:108:5:108:12 | MoveCtor |  |  |
+| copy.cpp:111:9:111:9 | MoveAssign |  |  |
 | copy.cpp:111:9:111:9 | MoveAssign | deleted |  |
 | copy.cpp:111:9:111:9 | operator= | deleted |  |
 | copy.cpp:113:17:113:25 | operator= |  |  |
--- a/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected
+++ b/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected
@@ -18,37 +18,46 @@
 | a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 2 | i |
 | a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 3 | operator= |
 | a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 4 | operator= |
-| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 0 | apple_x |
-| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 1 | operator= |
-| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 2 | operator= |
-| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 0 | banana_x |
-| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 1 | operator= |
-| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 2 | operator= |
-| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 0 | cherry_x |
-| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 1 | operator= |
-| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 2 | operator= |
-| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 0 | damson_x |
-| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 1 | bar |
-| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 1 | foo |
-| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 2 | operator= |
-| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 3 | operator= |
-| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 0 | apple_x |
-| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 1 | operator= |
-| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 2 | operator= |
-| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 0 | apple_x |
-| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 1 | operator= |
-| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 2 | operator= |
-| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 0 | banana_x |
-| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 1 | operator= |
-| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 2 | operator= |
-| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 0 | cherry_x |
-| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 1 | operator= |
-| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 2 | operator= |
-| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 0 | damson_x |
-| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 1 | bar |
-| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 1 | foo |
-| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 2 | operator= |
-| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 3 | operator= |
+| b1.cpp:6:7:6:21 | AppleCompatible | 4 members | 2 locations | 0 | apple_x |
+| b1.cpp:6:7:6:21 | AppleCompatible | 4 members | 2 locations | 1 | operator= |
+| b1.cpp:6:7:6:21 | AppleCompatible | 4 members | 2 locations | 2 | operator= |
+| b1.cpp:6:7:6:21 | AppleCompatible | 4 members | 2 locations | 3 | AppleCompatible |
+| b1.cpp:11:7:11:22 | BananaCompatible | 4 members | 2 locations | 0 | banana_x |
+| b1.cpp:11:7:11:22 | BananaCompatible | 4 members | 2 locations | 1 | operator= |
+| b1.cpp:11:7:11:22 | BananaCompatible | 4 members | 2 locations | 2 | operator= |
+| b1.cpp:11:7:11:22 | BananaCompatible | 4 members | 2 locations | 3 | BananaCompatible |
+| b1.cpp:16:7:16:12 | Cherry | 4 members | 1 locations | 0 | cherry_x |
+| b1.cpp:16:7:16:12 | Cherry | 4 members | 1 locations | 1 | operator= |
+| b1.cpp:16:7:16:12 | Cherry | 4 members | 1 locations | 2 | operator= |
+| b1.cpp:16:7:16:12 | Cherry | 4 members | 1 locations | 3 | Cherry |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 0 | damson_x |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 1 | bar |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 1 | foo |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 2 | operator= |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 3 | operator= |
+| b1.cpp:23:7:23:12 | Damson | 6 members | 2 locations | 4 | Damson |
+| b1.cpp:29:9:29:23 | AppleCompatible | 4 members | 1 locations | 0 | apple_x |
+| b1.cpp:29:9:29:23 | AppleCompatible | 4 members | 1 locations | 1 | operator= |
+| b1.cpp:29:9:29:23 | AppleCompatible | 4 members | 1 locations | 2 | operator= |
+| b1.cpp:29:9:29:23 | AppleCompatible | 4 members | 1 locations | 3 | AppleCompatible |
+| b2.cpp:2:7:2:21 | AppleCompatible | 4 members | 2 locations | 0 | apple_x |
+| b2.cpp:2:7:2:21 | AppleCompatible | 4 members | 2 locations | 1 | operator= |
+| b2.cpp:2:7:2:21 | AppleCompatible | 4 members | 2 locations | 2 | operator= |
+| b2.cpp:2:7:2:21 | AppleCompatible | 4 members | 2 locations | 3 | AppleCompatible |
+| b2.cpp:9:7:9:22 | BananaCompatible | 4 members | 2 locations | 0 | banana_x |
+| b2.cpp:9:7:9:22 | BananaCompatible | 4 members | 2 locations | 1 | operator= |
+| b2.cpp:9:7:9:22 | BananaCompatible | 4 members | 2 locations | 2 | operator= |
+| b2.cpp:9:7:9:22 | BananaCompatible | 4 members | 2 locations | 3 | BananaCompatible |
+| b2.cpp:14:7:14:12 | Cherry | 4 members | 1 locations | 0 | cherry_x |
+| b2.cpp:14:7:14:12 | Cherry | 4 members | 1 locations | 1 | operator= |
+| b2.cpp:14:7:14:12 | Cherry | 4 members | 1 locations | 2 | operator= |
+| b2.cpp:14:7:14:12 | Cherry | 4 members | 1 locations | 3 | Cherry |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 0 | damson_x |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 1 | bar |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 1 | foo |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 2 | operator= |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 3 | operator= |
+| b2.cpp:21:7:21:12 | Damson | 6 members | 2 locations | 4 | Damson |
 | file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 0 | gp_offset |
 | file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 1 | fp_offset |
 | file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 2 | overflow_arg_area |
--- a/cpp/ql/test/library-tests/structs/incomplete_definition/pointerbasetype.expected
+++ b/cpp/ql/test/library-tests/structs/incomplete_definition/pointerbasetype.expected
@@ -2,5 +2,5 @@
 | x.cpp:3:6:3:10 | bar_x | a.h:4:8:4:10 | Bar | 3 |
 | x.cpp:19:6:19:10 | foo_x | y.cpp:4:8:4:10 | Foo | 3 |
 | x.cpp:23:5:23:17 | templateField | x.cpp:6:10:6:12 | Foo | 3 |
-| x.cpp:23:5:23:17 | templateField | x.cpp:12:9:12:11 | Foo | 3 |
+| x.cpp:23:5:23:17 | templateField | x.cpp:12:9:12:11 | Foo | 4 |
 | x.cpp:26:18:26:29 | template_foo | x.cpp:22:7:22:14 | Template<Foo *> | 0 |
--- a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected
+++ b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected
@@ -47,8 +47,10 @@
 | isfromtemplateinstantiation.cpp:40:2:40:2 | return ... | isfromtemplateinstantiation.cpp:38:26:38:26 | normal_class::a_template_method<short>() |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | declaration of operator= | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | declaration of operator= | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
+| isfromtemplateinstantiation.cpp:44:26:44:26 | definition of template_class | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | template_class<char>::operator=(const template_class<char> &) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | template_class<char>::operator=(template_class<char> &&) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
+| isfromtemplateinstantiation.cpp:44:26:44:26 | template_class<char>::template_class() | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:46:4:46:4 | definition of t | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:46:4:46:4 | t | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
 | isfromtemplateinstantiation.cpp:49:7:49:7 | definition of b_method | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> |
--- a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected
+++ b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected
@@ -347,6 +347,7 @@ isFromUninstantiatedTemplate
 | isfromtemplateinstantiation.cpp:26:1:26:1 | return ... | I |  | Stmt |  |
 | isfromtemplateinstantiation.cpp:29:7:29:7 | declaration of operator= |  |  | DeclarationEntry |  |
 | isfromtemplateinstantiation.cpp:29:7:29:7 | declaration of operator= |  |  | DeclarationEntry |  |
+| isfromtemplateinstantiation.cpp:29:7:29:7 | normal_class |  |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:29:7:29:7 | operator= |  |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:29:7:29:7 | operator= |  |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:29:7:29:18 | normal_class |  |  | Declaration |  |
@@ -361,6 +362,7 @@ isFromUninstantiatedTemplate
 | isfromtemplateinstantiation.cpp:44:26:44:26 | declaration of operator= | I |  | DeclarationEntry |  |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | operator= | I |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:44:26:44:26 | operator= | I |  | Declaration |  |
+| isfromtemplateinstantiation.cpp:44:26:44:26 | template_class | I |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<T> |  | T | Declaration |  |
 | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class<char> | I |  | Declaration |  |
 | isfromtemplateinstantiation.cpp:46:4:46:4 | definition of t |  | T | Definition |  |
--- a/cpp/ql/test/library-tests/unions/Unions1.expected
+++ b/cpp/ql/test/library-tests/unions/Unions1.expected
@@ -1,6 +1,6 @@
 | unions.cpp:4:8:4:12 | Entry | Struct |  | operator= |
 | unions.cpp:13:7:13:11 | Value | Struct, Union |  | operator= |
-| unions.cpp:19:8:19:22 | EntryWithMethod | Struct | Entry | getAsInt, operator= |
+| unions.cpp:19:8:19:22 | EntryWithMethod | Struct | Entry | EntryWithMethod, getAsInt, operator= |
 | unions.cpp:27:9:27:20 | MyLocalUnion | LocalUnion, Struct, Union |  | operator= |
 | unions.cpp:33:7:33:13 | MyClass |  |  | operator= |
 | unions.cpp:36:9:36:21 | MyNestedUnion | NestedUnion, Struct, Union |  | operator= |
--- a/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected
+++ b/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected