From 1b7961367af09efc5b88f79aaa9eaf1a6a2b7d86 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 26 May 2018 01:17:22 +0100 Subject: [PATCH 1/3] C++: Enhance a test --- .../test/library-tests/numlines/numlines.cpp | 23 +++++++++++++++++++ .../library-tests/numlines/numlines.expected | 6 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cpp/ql/test/library-tests/numlines/numlines.cpp b/cpp/ql/test/library-tests/numlines/numlines.cpp index b91453f14870..bb4991f9a23d 100644 --- a/cpp/ql/test/library-tests/numlines/numlines.cpp +++ b/cpp/ql/test/library-tests/numlines/numlines.cpp @@ -48,3 +48,26 @@ void templateFunctionUser(signed int x, unsigned int y) { twiceUsedTemplateFunction(y); } +class C { + public: + int ff() { + int i; + gg(i); + } + // Although there is a declaration of gg starting here, + // the number of lines count shouldn't. + template + void gg(T t); +}; + + + +template +void C::gg(T t) { + ; +} +void hh() { + C n; + n.ff(); +} + diff --git a/cpp/ql/test/library-tests/numlines/numlines.expected b/cpp/ql/test/library-tests/numlines/numlines.expected index a04cd4c34f9e..9aa1c5c016c7 100644 --- a/cpp/ql/test/library-tests/numlines/numlines.expected +++ b/cpp/ql/test/library-tests/numlines/numlines.expected @@ -1,8 +1,12 @@ +| C::ff() | 4 | 4 | 0 | +| C::gg(T) | 4 | 4 | 0 | +| C::gg(T) | 10 | 7 | 0 | | conventional() | 4 | 4 | 1 | +| hh() | 4 | 4 | 0 | | long_char() | 3 | 3 | 0 | | long_string() | 5 | 5 | 0 | | misleading_comment() | 7 | 2 | 5 | -| numlines | 50 | 37 | 6 | +| numlines | 73 | 54 | 8 | | onceUsedTemplateFunction(T) | 6 | 6 | 0 | | templateFunctionUser(signed int,unsigned int) | 5 | 5 | 0 | | twiceUsedTemplateFunction(T) | 6 | 6 | 0 | From 894a37ccdac6fb5a3debed6124f88b80e530cba2 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 26 Sep 2018 14:38:45 +0100 Subject: [PATCH 2/3] C++: Accept test changes --- .../examples/expressions/PrintAST.expected | 12 +- .../deduplication/functions.expected | 4 +- .../deduplication/variables.expected | 2 + .../functions-in-headers/one_x.expected | 2 + .../library-tests/CPP-205/elements.expected | 10 +- .../library-tests/atomic/variables.expected | 2 + .../library-tests/blocks/cpp/blocks.expected | 2 + .../blocks/deduplication/functions.expected | 2 +- .../functions_file/isbuiltin.expected | 4 +- .../c++_exceptions/graphable.expected | 698 +++++------ .../library-tests/clang_ms/element.expected | 6 +- .../base_classes/base_classes.expected | 1 + .../conditions/elements.expected | 6 +- .../library-tests/conditions/vars.expected | 2 + .../controlflow/exits/exits.expected | 4 +- .../cpp_builtin_types/bool/Variables.expected | 2 + .../wchar_t/Variables.expected | 2 + .../declaration/IsMember.expected | 2 - .../more/declarationEntry.expected | 5 +- .../template/declarationEntry.expected | 2 +- .../template/usertype.expected | 2 +- .../default_parameters/variables.expected | 2 + .../depends_friends/Friend1.expected | 1 - .../VariableInitializers.expected | 2 + .../DerivedTypesBaseType.expected | 3 + .../library-tests/destructors/cfg.expected | 478 ++++---- .../floats/float128/functions.expected | 2 + .../functions/FunctionCalls.expected | 4 +- .../functions/functions/Functions1.expected | 6 +- .../functions/functions/Functions2.expected | 4 +- .../functions/qualifiers/test.expected | 1 + .../instantiations/test.expected | 2 +- .../library-tests/ir/ir/PrintAST.expected | 12 +- .../lambdas/captures/elements.expected | 6 +- .../library-tests/lambdas/cfg/cfg.expected | 202 ++-- .../locations/calls/calls.expected | 12 +- .../inmacroexpansion.expected | 3 + .../members/getters/members.expected | 48 +- .../members/templates/members.expected | 14 +- .../namespaces/namespaces/decls.expected | 6 +- .../namespaces/same_name/decls.expected | 2 + .../copy_from_prototype.expected | 4 - .../noexcept/noexcept_specifier.expected | 8 + .../library-tests/numlines/numlines.expected | 1 - .../parameters/Parameters1.expected | 4 +- .../pointsto/basic/sets.expected | 334 +++--- .../qualifiers/class-enum/decls.expected | 4 +- .../scopes/parents/parents.expected | 6 +- .../scopes/scopes/Scopes1.expected | 4 +- .../scopes/scopes/Scopes3.expected | 2 - .../scopes/scopes/Scopes4.expected | 4 +- .../functions/sideEffects.expected | 4 +- .../special_members/detect/detect.expected | 1 - .../structs/compatible_c/compatible.expected | 8 +- .../compatible_cpp/compatible.expected | 63 +- .../compatible_members.expected | 8 +- .../templates/CPP-203/decls.expected | 2 + .../templates/CPP-204/element.expected | 6 +- .../templates/CPP-223/decls.expected | 3 + .../templates/decls/decls.expected | 2 + .../destructors/destructors.expected | 2 +- .../templates/extern/elements.expected | 2 - .../templates/friends/decls.expected | 4 +- .../templates/functions/functions.expected | 8 +- .../incomplete_instantiations/test.expected | 6 +- .../functions.expected | 4 +- .../elements.expected | 24 +- .../instantiations.expected | 13 +- .../isfromtemplateinstantiation.expected | 217 ++-- .../isfromuninstantiatedtemplate.expected | 118 +- .../templates/switch/test.expected | 1 - .../type_instantiations/types.expected | 3 + .../type_sizes/type_sizes.expected | 3 + .../library-tests/typedefs/Typedefs1.expected | 2 + .../library-tests/types/types/Types.expected | 2 + .../library-tests/unnamed/elements.expected | 1 - .../types/unspecified_type.expected | 3 + .../unspecified_type/strip_top_level.expected | 2 + .../unspecified_type.expected | 2 + .../variables/variables/types.expected | 3 + .../variables/variables/variable.expected | 4 + .../vector_types/variables.expected | 11 + .../virtual_functions/cfg/cfg.expected | 298 ++--- .../MagicConstantsNumbers.expected | 3 + .../ReturnConstTypeMember.expected | 2 +- .../Dependencies/dependencies.expected | 4 +- .../AV Rule 82/AV Rule 82.expected | 2 +- .../AV Rule 85/AV Rule 85.expected | 4 - .../conditional_destructors/cfg.expected | 334 +++--- .../graphable.expected | 118 +- .../exceptionhandler/graphable.expected | 134 +-- .../stackvariables/graphable.expected | 1024 ++++++++--------- 92 files changed, 2209 insertions(+), 2199 deletions(-) diff --git a/cpp/ql/test/examples/expressions/PrintAST.expected b/cpp/ql/test/examples/expressions/PrintAST.expected index 065488c78ce8..57af0b2e4584 100644 --- a/cpp/ql/test/examples/expressions/PrintAST.expected +++ b/cpp/ql/test/examples/expressions/PrintAST.expected @@ -1,7 +1,3 @@ -#-----| __va_list_tag::operator=() -> __va_list_tag & -#-----| params: -#-----| __va_list_tag::operator=() -> __va_list_tag & -#-----| params: #-----| operator delete(void *) -> void #-----| params: #-----| 0: p#0 @@ -10,6 +6,14 @@ #-----| params: #-----| 0: p#0 #-----| Type = unsigned long +#-----| operator=(__va_list_tag &&) -> __va_list_tag & +#-----| params: +#-----| 0: p#0 +#-----| Type = __va_list_tag && +#-----| operator=(const __va_list_tag &) -> __va_list_tag & +#-----| params: +#-----| 0: p#0 +#-----| Type = const __va_list_tag & AddressOf.c: # 1| AddressOf(int) -> void # 1| params: diff --git a/cpp/ql/test/header-variant-tests/deduplication/functions.expected b/cpp/ql/test/header-variant-tests/deduplication/functions.expected index a5ffe6852907..2717bf8f4f94 100644 --- a/cpp/ql/test/header-variant-tests/deduplication/functions.expected +++ b/cpp/ql/test/header-variant-tests/deduplication/functions.expected @@ -2,8 +2,8 @@ | bar.h:1:13:1:15 | bar | MemberFunction | 1 | C | | bar.h:1:13:1:15 | bar | MemberFunction | 1 | C | | bar.h:1:13:1:15 | bar | MemberFunction | 2 | D | -| file://:0:0:0:0 | operator= | MemberFunction | 0 | __va_list_tag | -| file://:0:0:0:0 | operator= | MemberFunction | 0 | __va_list_tag | +| file://:0:0:0:0 | operator= | Function | 0 | | +| file://:0:0:0:0 | operator= | Function | 0 | | | foo.h:1:13:1:15 | foo | Function | 1 | | | foo.h:1:13:1:15 | foo | MemberFunction | 1 | C | | foo.h:1:13:1:15 | foo | MemberFunction | 1 | C | diff --git a/cpp/ql/test/header-variant-tests/deduplication/variables.expected b/cpp/ql/test/header-variant-tests/deduplication/variables.expected index 05233432cdbd..3db8c3c168cf 100644 --- a/cpp/ql/test/header-variant-tests/deduplication/variables.expected +++ b/cpp/ql/test/header-variant-tests/deduplication/variables.expected @@ -4,9 +4,11 @@ | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | C && | Variable | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | C && | Variable | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | D && | Variable | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag && | Variable | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const C & | Variable | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const C & | Variable | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const D & | Variable | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const __va_list_tag & | Variable | | | file://:0:0:0:0 | reg_save_area | file://:0:0:0:0 | void * | MemberVariable | __va_list_tag | | foo.h:7:5:7:15 | foo_defined | file://:0:0:0:0 | int | MemberVariable | C | | foo.h:7:5:7:15 | foo_defined | file://:0:0:0:0 | int | Variable | | diff --git a/cpp/ql/test/header-variant-tests/functions-in-headers/one_x.expected b/cpp/ql/test/header-variant-tests/functions-in-headers/one_x.expected index 990c69a3946d..1039dac1595f 100644 --- a/cpp/ql/test/header-variant-tests/functions-in-headers/one_x.expected +++ b/cpp/ql/test/header-variant-tests/functions-in-headers/one_x.expected @@ -2,4 +2,6 @@ | file://:0:0:0:0 | fp_offset | fp_offset | false | | file://:0:0:0:0 | gp_offset | gp_offset | false | | file://:0:0:0:0 | overflow_arg_area | overflow_arg_area | false | +| file://:0:0:0:0 | p#0 | p#0 | false | +| file://:0:0:0:0 | p#0 | p#0 | false | | file://:0:0:0:0 | reg_save_area | reg_save_area | false | diff --git a/cpp/ql/test/library-tests/CPP-205/elements.expected b/cpp/ql/test/library-tests/CPP-205/elements.expected index 5988280f9a91..5f0b201d7fbc 100644 --- a/cpp/ql/test/library-tests/CPP-205/elements.expected +++ b/cpp/ql/test/library-tests/CPP-205/elements.expected @@ -1,9 +1,11 @@ | CPP-205.cpp:0:0:0:0 | CPP-205.cpp | | CPP-205.cpp:1:20:1:20 | T | | CPP-205.cpp:1:20:1:20 | definition of T | +| CPP-205.cpp:2:5:2:5 | definition of fn | +| CPP-205.cpp:2:5:2:5 | fn | | CPP-205.cpp:2:5:2:6 | definition of fn | | CPP-205.cpp:2:5:2:6 | fn | -| CPP-205.cpp:2:5:2:6 | fn | +| CPP-205.cpp:2:10:2:12 | definition of out | | CPP-205.cpp:2:10:2:12 | definition of out | | CPP-205.cpp:2:10:2:12 | out | | CPP-205.cpp:2:10:2:12 | out | @@ -12,8 +14,6 @@ | CPP-205.cpp:3:3:3:33 | declaration | | CPP-205.cpp:3:3:3:33 | declaration | | CPP-205.cpp:3:15:3:15 | declaration of y | -| CPP-205.cpp:3:15:3:15 | declaration of y | -| CPP-205.cpp:3:15:3:15 | y | | CPP-205.cpp:3:15:3:15 | y | | CPP-205.cpp:3:17:3:31 | 5 | | CPP-205.cpp:4:3:4:11 | return ... | @@ -26,5 +26,9 @@ | CPP-205.cpp:8:3:8:15 | return ... | | CPP-205.cpp:8:10:8:11 | call to fn | | CPP-205.cpp:8:13:8:13 | 0 | +| file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | operator= | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | y | diff --git a/cpp/ql/test/library-tests/atomic/variables.expected b/cpp/ql/test/library-tests/atomic/variables.expected index e5303709924c..bd56dc05e0f9 100644 --- a/cpp/ql/test/library-tests/atomic/variables.expected +++ b/cpp/ql/test/library-tests/atomic/variables.expected @@ -13,7 +13,9 @@ | k | _Atomic(int) *_Atomic | atomic {pointer to {atomic {int}}} | | m | int | int | | overflow_arg_area | void * | pointer to {void} | +| p#0 | __va_list_tag && | rvalue reference to {struct __va_list_tag} | | p#0 | atomic_box && | rvalue reference to {struct atomic_box} | +| p#0 | const __va_list_tag & | reference to {const {struct __va_list_tag}} | | p#0 | const atomic_box & | reference to {const {struct atomic_box}} | | reg_save_area | void * | pointer to {void} | | value | _Atomic(T) | atomic {T} | diff --git a/cpp/ql/test/library-tests/blocks/cpp/blocks.expected b/cpp/ql/test/library-tests/blocks/cpp/blocks.expected index 5a4830a470f1..1716b2ef93c2 100644 --- a/cpp/ql/test/library-tests/blocks/cpp/blocks.expected +++ b/cpp/ql/test/library-tests/blocks/cpp/blocks.expected @@ -26,5 +26,7 @@ | file://:0:0:0:0 | gp_offset | file://:0:0:0:0 | unsigned int | unsigned int | | file://:0:0:0:0 | overflow_arg_area | file://:0:0:0:0 | void * | pointer to {void} | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | Example && | rvalue reference to {struct Example} | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag && | rvalue reference to {struct __va_list_tag} | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const Example & | reference to {const {struct Example}} | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const __va_list_tag & | reference to {const {struct __va_list_tag}} | | file://:0:0:0:0 | reg_save_area | file://:0:0:0:0 | void * | pointer to {void} | diff --git a/cpp/ql/test/library-tests/blocks/deduplication/functions.expected b/cpp/ql/test/library-tests/blocks/deduplication/functions.expected index 9f4d90dd1f1f..7e55b4322aa4 100644 --- a/cpp/ql/test/library-tests/blocks/deduplication/functions.expected +++ b/cpp/ql/test/library-tests/blocks/deduplication/functions.expected @@ -1,3 +1,3 @@ | 1 | 1 | -| 2 | 1 | +| 2 | 2 | | 9 | 2 | diff --git a/cpp/ql/test/library-tests/builtins/functions_file/isbuiltin.expected b/cpp/ql/test/library-tests/builtins/functions_file/isbuiltin.expected index 00a331f6f44e..72e065f79a89 100644 --- a/cpp/ql/test/library-tests/builtins/functions_file/isbuiltin.expected +++ b/cpp/ql/test/library-tests/builtins/functions_file/isbuiltin.expected @@ -1,4 +1,4 @@ | file://:0:0:0:0 | __builtin_add_overflow | true | 0 | file://:0:0:0:0 | bool | -| file://:0:0:0:0 | __builtin_foobar | true | 0 | file://:0:0:0:0 | int | -| file://:0:0:0:0 | __builtin_malloc | true | 0 | file://:0:0:0:0 | float | +| file://:0:0:0:0 | __builtin_foobar | true | 1 | file://:0:0:0:0 | int | +| file://:0:0:0:0 | __builtin_malloc | true | 4 | file://:0:0:0:0 | float | | test.c:1:6:1:6 | f | false | 3 | file://:0:0:0:0 | long | diff --git a/cpp/ql/test/library-tests/c++_exceptions/graphable.expected b/cpp/ql/test/library-tests/c++_exceptions/graphable.expected index a8d075b33827..0ec6617bb27b 100644 --- a/cpp/ql/test/library-tests/c++_exceptions/graphable.expected +++ b/cpp/ql/test/library-tests/c++_exceptions/graphable.expected @@ -1,351 +1,351 @@ -| C::C | false | 390 | 390 | C | -| C::C | false | 393 | 393 | C | -| C::operator= | false | 388 | 388 | operator= | -| C::~C | false | 392 | 392 | ~C | -| Error::Error | false | 131 | 131 | Error | -| Error::Error | false | 135 | 135 | return ... | -| Error::Error | false | 137 | 137 | { ... } | -| Error::Error | false | 152 | 152 | Error | -| Error::Error | true | 135 | 131 | | -| Error::Error | true | 137 | 135 | | -| Error::operator= | false | 150 | 150 | operator= | -| Error::~Error | false | 140 | 140 | ~Error | -| Error::~Error | false | 144 | 144 | return ... | -| Error::~Error | false | 146 | 146 | { ... } | -| Error::~Error | true | 144 | 140 | | -| Error::~Error | true | 146 | 144 | | -| __va_list_tag::operator= | false | 123 | 123 | operator= | -| __va_list_tag::operator= | false | 127 | 127 | operator= | -| f | false | 407 | 407 | f | -| f | false | 413 | 413 | call to C | -| f | false | 417 | 417 | 101 | -| f | false | 418 | 418 | initializer for c101 | -| f | false | 423 | 423 | call to C | -| f | false | 427 | 427 | 105 | -| f | false | 428 | 428 | initializer for c105 | -| f | false | 433 | 433 | call to C | -| f | false | 437 | 437 | 109 | -| f | false | 438 | 438 | initializer for c109 | -| f | false | 443 | 443 | call to C | -| f | false | 447 | 447 | 102 | -| f | false | 448 | 448 | initializer for c102 | -| f | false | 453 | 453 | call to C | -| f | false | 457 | 457 | 103 | -| f | false | 458 | 458 | initializer for c103 | -| f | false | 463 | 463 | call to C | -| f | false | 467 | 467 | 104 | -| f | false | 468 | 468 | initializer for c104 | -| f | false | 473 | 473 | call to C | -| f | false | 477 | 477 | 106 | -| f | false | 478 | 478 | initializer for c106 | -| f | false | 483 | 483 | call to C | -| f | false | 487 | 487 | 107 | -| f | false | 488 | 488 | initializer for c107 | -| f | false | 493 | 493 | call to C | -| f | false | 497 | 497 | 108 | -| f | false | 498 | 498 | initializer for c108 | -| f | false | 502 | 502 | declaration | -| f | false | 504 | 504 | declaration | -| f | false | 506 | 506 | b1 | -| f | false | 508 | 508 | (bool)... | -| f | false | 512 | 512 | 1 | -| f | false | 513 | 513 | throw ... | -| f | false | 515 | 515 | ExprStmt | -| f | false | 517 | 517 | { ... } | -| f | false | 519 | 519 | if (...) ... | -| f | false | 521 | 521 | declaration | -| f | false | 523 | 523 | { ... } | -| f | false | 529 | 529 | 1 | -| f | false | 530 | 530 | declaration | -| f | false | 532 | 532 | { ... } | -| f | false | 534 | 534 | __try { ... } __except( ... ) { ... } | -| f | false | 536 | 536 | declaration | -| f | false | 538 | 538 | declaration | -| f | false | 540 | 540 | b2 | -| f | false | 542 | 542 | (bool)... | -| f | false | 546 | 546 | 2 | -| f | false | 547 | 547 | throw ... | -| f | false | 549 | 549 | ExprStmt | -| f | false | 551 | 551 | { ... } | -| f | false | 553 | 553 | if (...) ... | -| f | false | 555 | 555 | declaration | -| f | false | 557 | 557 | { ... } | -| f | false | 559 | 559 | declaration | -| f | false | 561 | 561 | { ... } | -| f | false | 563 | 563 | __try { ... } __finally { ... } | -| f | false | 565 | 565 | declaration | -| f | false | 567 | 567 | return ... | -| f | false | 569 | 569 | { ... } | -| f | false | 571 | 571 | c101 | -| f | false | 573 | 573 | call to c101.~C | -| f | false | 574 | 574 | c105 | -| f | false | 575 | 575 | call to c105.~C | -| f | false | 576 | 576 | c109 | -| f | false | 577 | 577 | call to c109.~C | -| f | false | 578 | 578 | c101 | -| f | false | 579 | 579 | call to c101.~C | -| f | false | 580 | 580 | c105 | -| f | false | 581 | 581 | call to c105.~C | -| f | false | 582 | 582 | c108 | -| f | false | 584 | 584 | call to c108.~C | -| f | false | 585 | 585 | c106 | -| f | false | 587 | 587 | call to c106.~C | -| f | false | 588 | 588 | c107 | -| f | false | 589 | 589 | call to c107.~C | -| f | false | 590 | 590 | c106 | -| f | false | 591 | 591 | call to c106.~C | -| f | false | 592 | 592 | c104 | -| f | false | 594 | 594 | call to c104.~C | -| f | false | 595 | 595 | c102 | -| f | false | 597 | 597 | call to c102.~C | -| f | false | 598 | 598 | c103 | -| f | false | 599 | 599 | call to c103.~C | -| f | false | 600 | 600 | c102 | -| f | false | 601 | 601 | call to c102.~C | -| f | true | 413 | 534 | | -| f | true | 417 | 413 | | -| f | true | 418 | 417 | | -| f | true | 423 | 563 | | -| f | true | 427 | 423 | | -| f | true | 428 | 427 | | -| f | true | 433 | 567 | | -| f | true | 437 | 433 | | -| f | true | 438 | 437 | | -| f | true | 443 | 519 | | -| f | true | 447 | 443 | | -| f | true | 448 | 447 | | -| f | true | 453 | 598 | | -| f | true | 457 | 453 | | -| f | true | 458 | 457 | | -| f | true | 463 | 592 | | -| f | true | 467 | 463 | | -| f | true | 468 | 467 | | -| f | true | 473 | 553 | | -| f | true | 477 | 473 | | -| f | true | 478 | 477 | | -| f | true | 483 | 588 | | -| f | true | 487 | 483 | | -| f | true | 488 | 487 | | -| f | true | 493 | 582 | | -| f | true | 497 | 493 | | -| f | true | 498 | 497 | | -| f | true | 502 | 418 | | -| f | true | 504 | 448 | | -| f | true | 506 | 517 | T | -| f | true | 506 | 521 | F | -| f | true | 512 | 513 | | -| f | true | 513 | 600 | | -| f | true | 515 | 512 | | -| f | true | 517 | 515 | | -| f | true | 519 | 506 | | -| f | true | 521 | 458 | | -| f | true | 523 | 504 | | -| f | true | 529 | 532 | T | -| f | true | 530 | 468 | | -| f | true | 532 | 530 | | -| f | true | 534 | 523 | | -| f | true | 536 | 428 | | -| f | true | 538 | 478 | | -| f | true | 540 | 551 | T | -| f | true | 540 | 555 | F | -| f | true | 546 | 547 | | -| f | true | 547 | 590 | | -| f | true | 549 | 546 | | -| f | true | 551 | 549 | | -| f | true | 553 | 540 | | -| f | true | 555 | 488 | | -| f | true | 557 | 538 | | -| f | true | 559 | 498 | | -| f | true | 561 | 559 | | -| f | true | 563 | 557 | | -| f | true | 565 | 438 | | -| f | true | 567 | 576 | | -| f | true | 569 | 502 | | -| f | true | 571 | 573 | | -| f | true | 573 | 407 | | +| C::C | false | 436 | 436 | C | +| C::C | false | 625 | 625 | C | +| C::operator= | false | 618 | 618 | operator= | +| C::~C | false | 557 | 557 | ~C | +| Error::Error | false | 242 | 242 | Error | +| Error::Error | false | 255 | 255 | Error | +| Error::Error | false | 260 | 260 | return ... | +| Error::Error | false | 262 | 262 | { ... } | +| Error::Error | true | 260 | 255 | | +| Error::Error | true | 262 | 260 | | +| Error::operator= | false | 236 | 236 | operator= | +| Error::~Error | false | 246 | 246 | ~Error | +| Error::~Error | false | 251 | 251 | return ... | +| Error::~Error | false | 253 | 253 | { ... } | +| Error::~Error | true | 251 | 246 | | +| Error::~Error | true | 253 | 251 | | +| f | false | 420 | 420 | f | +| f | false | 431 | 431 | declaration | +| f | false | 434 | 434 | call to C | +| f | false | 439 | 439 | 102 | +| f | false | 440 | 440 | initializer for c102 | +| f | false | 444 | 444 | call to C | +| f | false | 448 | 448 | 103 | +| f | false | 449 | 449 | initializer for c103 | +| f | false | 452 | 452 | declaration | +| f | false | 454 | 454 | b1 | +| f | false | 456 | 456 | (bool)... | +| f | false | 459 | 459 | 1 | +| f | false | 460 | 460 | throw ... | +| f | false | 462 | 462 | ExprStmt | +| f | false | 464 | 464 | { ... } | +| f | false | 466 | 466 | if (...) ... | +| f | false | 468 | 468 | declaration | +| f | false | 470 | 470 | { ... } | +| f | false | 477 | 477 | 1 | +| f | false | 479 | 479 | call to C | +| f | false | 483 | 483 | 104 | +| f | false | 484 | 484 | initializer for c104 | +| f | false | 487 | 487 | declaration | +| f | false | 489 | 489 | { ... } | +| f | false | 491 | 491 | __try { ... } __except( ... ) { ... } | +| f | false | 493 | 493 | declaration | +| f | false | 496 | 496 | call to C | +| f | false | 500 | 500 | 106 | +| f | false | 501 | 501 | initializer for c106 | +| f | false | 505 | 505 | call to C | +| f | false | 509 | 509 | 107 | +| f | false | 510 | 510 | initializer for c107 | +| f | false | 513 | 513 | declaration | +| f | false | 515 | 515 | b2 | +| f | false | 517 | 517 | (bool)... | +| f | false | 520 | 520 | 2 | +| f | false | 521 | 521 | throw ... | +| f | false | 523 | 523 | ExprStmt | +| f | false | 525 | 525 | { ... } | +| f | false | 527 | 527 | if (...) ... | +| f | false | 529 | 529 | declaration | +| f | false | 531 | 531 | { ... } | +| f | false | 534 | 534 | call to C | +| f | false | 538 | 538 | 108 | +| f | false | 539 | 539 | initializer for c108 | +| f | false | 542 | 542 | declaration | +| f | false | 544 | 544 | { ... } | +| f | false | 546 | 546 | __try { ... } __finally { ... } | +| f | false | 548 | 548 | declaration | +| f | false | 550 | 550 | return ... | +| f | false | 552 | 552 | { ... } | +| f | false | 554 | 554 | c101 | +| f | false | 556 | 556 | call to c101.~C | +| f | false | 558 | 558 | c105 | +| f | false | 559 | 559 | call to c105.~C | +| f | false | 560 | 560 | c109 | +| f | false | 561 | 561 | call to c109.~C | +| f | false | 562 | 562 | c101 | +| f | false | 563 | 563 | call to c101.~C | +| f | false | 564 | 564 | c105 | +| f | false | 565 | 565 | call to c105.~C | +| f | false | 566 | 566 | c108 | +| f | false | 568 | 568 | call to c108.~C | +| f | false | 569 | 569 | c106 | +| f | false | 571 | 571 | call to c106.~C | +| f | false | 572 | 572 | c107 | +| f | false | 573 | 573 | call to c107.~C | +| f | false | 574 | 574 | c106 | +| f | false | 575 | 575 | call to c106.~C | +| f | false | 576 | 576 | c104 | +| f | false | 578 | 578 | call to c104.~C | +| f | false | 579 | 579 | c102 | +| f | false | 581 | 581 | call to c102.~C | +| f | false | 582 | 582 | c103 | +| f | false | 583 | 583 | call to c103.~C | +| f | false | 584 | 584 | c102 | +| f | false | 585 | 585 | call to c102.~C | +| f | false | 587 | 587 | call to C | +| f | false | 591 | 591 | 101 | +| f | false | 592 | 592 | initializer for c101 | +| f | false | 596 | 596 | call to C | +| f | false | 600 | 600 | 105 | +| f | false | 601 | 601 | initializer for c105 | +| f | false | 605 | 605 | call to C | +| f | false | 609 | 609 | 109 | +| f | false | 610 | 610 | initializer for c109 | +| f | true | 431 | 592 | | +| f | true | 434 | 466 | | +| f | true | 439 | 434 | | +| f | true | 440 | 439 | | +| f | true | 444 | 582 | | +| f | true | 448 | 444 | | +| f | true | 449 | 448 | | +| f | true | 452 | 440 | | +| f | true | 454 | 464 | T | +| f | true | 454 | 468 | F | +| f | true | 459 | 460 | | +| f | true | 460 | 584 | | +| f | true | 462 | 459 | | +| f | true | 464 | 462 | | +| f | true | 466 | 454 | | +| f | true | 468 | 449 | | +| f | true | 470 | 452 | | +| f | true | 477 | 489 | T | +| f | true | 479 | 576 | | +| f | true | 483 | 479 | | +| f | true | 484 | 483 | | +| f | true | 487 | 484 | | +| f | true | 489 | 487 | | +| f | true | 491 | 470 | | +| f | true | 493 | 601 | | +| f | true | 496 | 527 | | +| f | true | 500 | 496 | | +| f | true | 501 | 500 | | +| f | true | 505 | 572 | | +| f | true | 509 | 505 | | +| f | true | 510 | 509 | | +| f | true | 513 | 501 | | +| f | true | 515 | 525 | T | +| f | true | 515 | 529 | F | +| f | true | 520 | 521 | | +| f | true | 521 | 574 | | +| f | true | 523 | 520 | | +| f | true | 525 | 523 | | +| f | true | 527 | 515 | | +| f | true | 529 | 510 | | +| f | true | 531 | 513 | | +| f | true | 534 | 566 | | +| f | true | 538 | 534 | | +| f | true | 539 | 538 | | +| f | true | 542 | 539 | | +| f | true | 544 | 542 | | +| f | true | 546 | 531 | | +| f | true | 548 | 610 | | +| f | true | 550 | 560 | | +| f | true | 552 | 431 | | +| f | true | 554 | 556 | | +| f | true | 556 | 420 | | +| f | true | 558 | 559 | | +| f | true | 559 | 554 | | +| f | true | 560 | 561 | | +| f | true | 561 | 558 | | +| f | true | 562 | 563 | | +| f | true | 563 | 420 | | +| f | true | 564 | 565 | | +| f | true | 565 | 562 | | +| f | true | 566 | 568 | | +| f | true | 568 | 548 | | +| f | true | 568 | 564 | | +| f | true | 569 | 571 | | +| f | true | 571 | 544 | | +| f | true | 572 | 573 | | +| f | true | 573 | 569 | | | f | true | 574 | 575 | | -| f | true | 575 | 571 | | -| f | true | 576 | 577 | | -| f | true | 577 | 574 | | -| f | true | 578 | 579 | | -| f | true | 579 | 407 | | -| f | true | 580 | 581 | | -| f | true | 581 | 578 | | -| f | true | 582 | 584 | | -| f | true | 584 | 565 | | -| f | true | 584 | 580 | | -| f | true | 585 | 587 | | -| f | true | 587 | 561 | | -| f | true | 588 | 589 | | -| f | true | 589 | 585 | | -| f | true | 590 | 591 | | -| f | true | 591 | 561 | | -| f | true | 592 | 594 | | -| f | true | 594 | 536 | | -| f | true | 595 | 597 | | -| f | true | 597 | 536 | | -| f | true | 598 | 599 | | -| f | true | 599 | 595 | | -| f | true | 600 | 601 | | -| f | true | 601 | 529 | | -| f1 | false | 251 | 251 | f1 | -| f2 | false | 254 | 254 | f2 | -| f3 | false | 257 | 257 | f3 | -| f4 | false | 261 | 261 | f4 | -| f4 | false | 264 | 264 | return ... | -| f4 | false | 266 | 266 | { ... } | -| f4 | true | 264 | 261 | | -| f4 | true | 266 | 264 | | -| f5 | false | 269 | 269 | f5 | -| f5 | false | 274 | 274 | 3 | -| f5 | false | 275 | 275 | throw ... | -| f5 | false | 277 | 277 | ExprStmt | -| f5 | false | 279 | 279 | { ... } | -| f5 | true | 274 | 275 | | -| f5 | true | 275 | 269 | | -| f5 | true | 277 | 274 | | -| f5 | true | 279 | 277 | | -| fun | false | 297 | 297 | fun | -| fun | false | 311 | 311 | call to f1 | -| fun | false | 313 | 313 | ExprStmt | -| fun | false | 315 | 315 | call to f2 | -| fun | false | 317 | 317 | ExprStmt | -| fun | false | 319 | 319 | call to f3 | -| fun | false | 321 | 321 | ExprStmt | -| fun | false | 323 | 323 | call to f4 | -| fun | false | 325 | 325 | ExprStmt | -| fun | false | 327 | 327 | call to f5 | -| fun | false | 329 | 329 | ExprStmt | -| fun | false | 333 | 333 | 5 | -| fun | false | 334 | 334 | throw ... | -| fun | false | 336 | 336 | ExprStmt | -| fun | false | 338 | 338 | call to g | -| fun | false | 340 | 340 | ExprStmt | -| fun | false | 342 | 342 | { ... } | -| fun | false | 344 | 344 | call to h | -| fun | false | 346 | 346 | ExprStmt | -| fun | false | 348 | 348 | { ... } | -| fun | false | 350 | 350 | | -| fun | false | 351 | 351 | try { ... } | -| fun | false | 353 | 353 | { ... } | -| fun | false | 355 | 355 | call to i | -| fun | false | 357 | 357 | ExprStmt | -| fun | false | 359 | 359 | { ... } | -| fun | false | 361 | 361 | call to j | -| fun | false | 363 | 363 | ExprStmt | -| fun | false | 365 | 365 | { ... } | -| fun | false | 367 | 367 | | -| fun | false | 368 | 368 | | -| fun | false | 369 | 369 | try { ... } | -| fun | false | 371 | 371 | call to k | -| fun | false | 373 | 373 | ExprStmt | -| fun | false | 375 | 375 | return ... | -| fun | false | 377 | 377 | { ... } | -| fun | true | 311 | 317 | | -| fun | true | 313 | 311 | | -| fun | true | 315 | 321 | | -| fun | true | 317 | 315 | | -| fun | true | 319 | 325 | | -| fun | true | 321 | 319 | | -| fun | true | 323 | 329 | | -| fun | true | 325 | 323 | | -| fun | true | 327 | 336 | | +| f | true | 575 | 544 | | +| f | true | 576 | 578 | | +| f | true | 578 | 493 | | +| f | true | 579 | 581 | | +| f | true | 581 | 493 | | +| f | true | 582 | 583 | | +| f | true | 583 | 579 | | +| f | true | 584 | 585 | | +| f | true | 585 | 477 | | +| f | true | 587 | 491 | | +| f | true | 591 | 587 | | +| f | true | 592 | 591 | | +| f | true | 596 | 546 | | +| f | true | 600 | 596 | | +| f | true | 601 | 600 | | +| f | true | 605 | 550 | | +| f | true | 609 | 605 | | +| f | true | 610 | 609 | | +| f1 | false | 275 | 275 | f1 | +| f2 | false | 282 | 282 | f2 | +| f3 | false | 287 | 287 | f3 | +| f4 | false | 292 | 292 | f4 | +| f4 | false | 381 | 381 | return ... | +| f4 | false | 383 | 383 | { ... } | +| f4 | true | 381 | 292 | | +| f4 | true | 383 | 381 | | +| f5 | false | 297 | 297 | f5 | +| f5 | false | 370 | 370 | 3 | +| f5 | false | 371 | 371 | throw ... | +| f5 | false | 373 | 373 | ExprStmt | +| f5 | false | 375 | 375 | { ... } | +| f5 | true | 370 | 371 | | +| f5 | true | 371 | 297 | | +| f5 | true | 373 | 370 | | +| f5 | true | 375 | 373 | | +| fun | false | 270 | 270 | fun | +| fun | false | 278 | 278 | call to f1 | +| fun | false | 280 | 280 | ExprStmt | +| fun | false | 283 | 283 | call to f2 | +| fun | false | 285 | 285 | ExprStmt | +| fun | false | 288 | 288 | call to f3 | +| fun | false | 290 | 290 | ExprStmt | +| fun | false | 293 | 293 | call to f4 | +| fun | false | 295 | 295 | ExprStmt | +| fun | false | 298 | 298 | call to f5 | +| fun | false | 300 | 300 | ExprStmt | +| fun | false | 304 | 304 | 5 | +| fun | false | 305 | 305 | throw ... | +| fun | false | 307 | 307 | ExprStmt | +| fun | false | 310 | 310 | call to g | +| fun | false | 312 | 312 | ExprStmt | +| fun | false | 314 | 314 | { ... } | +| fun | false | 320 | 320 | call to h | +| fun | false | 322 | 322 | ExprStmt | +| fun | false | 324 | 324 | { ... } | +| fun | false | 326 | 326 | | +| fun | false | 327 | 327 | try { ... } | +| fun | false | 329 | 329 | { ... } | +| fun | false | 335 | 335 | call to i | +| fun | false | 337 | 337 | ExprStmt | +| fun | false | 339 | 339 | { ... } | +| fun | false | 345 | 345 | call to j | +| fun | false | 347 | 347 | ExprStmt | +| fun | false | 349 | 349 | { ... } | +| fun | false | 351 | 351 | | +| fun | false | 352 | 352 | | +| fun | false | 353 | 353 | try { ... } | +| fun | false | 356 | 356 | call to k | +| fun | false | 358 | 358 | ExprStmt | +| fun | false | 360 | 360 | return ... | +| fun | false | 362 | 362 | { ... } | +| fun | true | 278 | 285 | | +| fun | true | 280 | 278 | | +| fun | true | 283 | 290 | | +| fun | true | 285 | 283 | | +| fun | true | 288 | 295 | | +| fun | true | 290 | 288 | | +| fun | true | 293 | 300 | | +| fun | true | 295 | 293 | | +| fun | true | 298 | 307 | | +| fun | true | 300 | 298 | | +| fun | true | 304 | 305 | | +| fun | true | 305 | 326 | | +| fun | true | 307 | 304 | | +| fun | true | 310 | 358 | | +| fun | true | 312 | 310 | | +| fun | true | 314 | 280 | | +| fun | true | 320 | 358 | | +| fun | true | 322 | 320 | | +| fun | true | 324 | 322 | | +| fun | true | 326 | 324 | | +| fun | true | 326 | 351 | | +| fun | true | 327 | 314 | | | fun | true | 329 | 327 | | -| fun | true | 333 | 334 | | -| fun | true | 334 | 350 | | -| fun | true | 336 | 333 | | -| fun | true | 338 | 373 | | -| fun | true | 340 | 338 | | -| fun | true | 342 | 313 | | -| fun | true | 344 | 373 | | -| fun | true | 346 | 344 | | -| fun | true | 348 | 346 | | -| fun | true | 350 | 348 | | -| fun | true | 350 | 367 | | -| fun | true | 351 | 342 | | -| fun | true | 353 | 351 | | -| fun | true | 355 | 373 | | -| fun | true | 357 | 355 | | -| fun | true | 359 | 357 | | -| fun | true | 361 | 373 | | -| fun | true | 363 | 361 | | -| fun | true | 365 | 363 | | -| fun | true | 367 | 359 | | -| fun | true | 367 | 368 | | -| fun | true | 368 | 297 | | -| fun | true | 368 | 365 | | -| fun | true | 369 | 353 | | -| fun | true | 371 | 375 | | -| fun | true | 373 | 371 | | -| fun | true | 375 | 297 | | -| fun | true | 377 | 369 | | -| fun2 | false | 160 | 160 | fun2 | -| fun2 | false | 165 | 165 | { ... } | -| fun2 | false | 167 | 167 | re-throw exception | -| fun2 | false | 169 | 169 | ExprStmt | -| fun2 | false | 171 | 171 | { ... } | -| fun2 | false | 175 | 175 | 1 | -| fun2 | false | 176 | 176 | return ... | -| fun2 | false | 178 | 178 | { ... } | -| fun2 | false | 180 | 180 | | -| fun2 | false | 181 | 181 | | -| fun2 | false | 182 | 182 | try { ... } | -| fun2 | false | 186 | 186 | 0 | -| fun2 | false | 187 | 187 | return ... | -| fun2 | false | 189 | 189 | { ... } | -| fun2 | false | 200 | 200 | fun2 | -| fun2 | false | 207 | 207 | { ... } | -| fun2 | false | 209 | 209 | re-throw exception | -| fun2 | false | 211 | 211 | ExprStmt | -| fun2 | false | 213 | 213 | { ... } | -| fun2 | false | 216 | 216 | 1 | -| fun2 | false | 217 | 217 | return ... | -| fun2 | false | 219 | 219 | { ... } | -| fun2 | false | 221 | 221 | | -| fun2 | false | 222 | 222 | | -| fun2 | false | 223 | 223 | try { ... } | -| fun2 | false | 226 | 226 | 0 | -| fun2 | false | 227 | 227 | return ... | -| fun2 | false | 229 | 229 | { ... } | -| fun2 | true | 165 | 187 | | -| fun2 | true | 167 | 160 | | -| fun2 | true | 169 | 167 | | -| fun2 | true | 171 | 169 | | -| fun2 | true | 175 | 160 | | -| fun2 | true | 176 | 175 | | -| fun2 | true | 178 | 176 | | -| fun2 | true | 180 | 171 | | -| fun2 | true | 180 | 181 | | -| fun2 | true | 181 | 178 | | -| fun2 | true | 182 | 165 | | -| fun2 | true | 186 | 160 | | -| fun2 | true | 187 | 186 | | -| fun2 | true | 189 | 182 | | -| fun2 | true | 207 | 227 | | -| fun2 | true | 209 | 200 | | -| fun2 | true | 211 | 209 | | -| fun2 | true | 213 | 211 | | -| fun2 | true | 216 | 200 | | -| fun2 | true | 217 | 216 | | -| fun2 | true | 219 | 217 | | -| fun2 | true | 221 | 213 | | -| fun2 | true | 221 | 222 | | -| fun2 | true | 222 | 219 | | -| fun2 | true | 223 | 207 | | -| fun2 | true | 226 | 200 | | -| fun2 | true | 227 | 226 | | -| fun2 | true | 229 | 223 | | -| g | false | 281 | 281 | g | -| h | false | 284 | 284 | h | -| i | false | 287 | 287 | i | -| j | false | 290 | 290 | j | -| k | false | 293 | 293 | k | -| run_fun2 | false | 195 | 195 | run_fun2 | -| run_fun2 | false | 231 | 231 | call to fun2 | -| run_fun2 | false | 233 | 233 | ExprStmt | -| run_fun2 | false | 235 | 235 | return ... | -| run_fun2 | false | 237 | 237 | { ... } | -| run_fun2 | true | 231 | 235 | | -| run_fun2 | true | 233 | 231 | | -| run_fun2 | true | 235 | 195 | | -| run_fun2 | true | 237 | 233 | | +| fun | true | 335 | 358 | | +| fun | true | 337 | 335 | | +| fun | true | 339 | 337 | | +| fun | true | 345 | 358 | | +| fun | true | 347 | 345 | | +| fun | true | 349 | 347 | | +| fun | true | 351 | 339 | | +| fun | true | 351 | 352 | | +| fun | true | 352 | 270 | | +| fun | true | 352 | 349 | | +| fun | true | 353 | 329 | | +| fun | true | 356 | 360 | | +| fun | true | 358 | 356 | | +| fun | true | 360 | 270 | | +| fun | true | 362 | 353 | | +| fun2 | false | 187 | 187 | fun2 | +| fun2 | false | 198 | 198 | fun2 | +| fun2 | false | 201 | 201 | { ... } | +| fun2 | false | 206 | 206 | re-throw exception | +| fun2 | false | 208 | 208 | ExprStmt | +| fun2 | false | 210 | 210 | { ... } | +| fun2 | false | 214 | 214 | 1 | +| fun2 | false | 215 | 215 | return ... | +| fun2 | false | 217 | 217 | { ... } | +| fun2 | false | 219 | 219 | | +| fun2 | false | 220 | 220 | | +| fun2 | false | 221 | 221 | try { ... } | +| fun2 | false | 225 | 225 | 0 | +| fun2 | false | 226 | 226 | return ... | +| fun2 | false | 228 | 228 | { ... } | +| fun2 | false | 644 | 644 | { ... } | +| fun2 | false | 649 | 649 | re-throw exception | +| fun2 | false | 650 | 650 | ExprStmt | +| fun2 | false | 651 | 651 | { ... } | +| fun2 | false | 653 | 653 | 1 | +| fun2 | false | 654 | 654 | return ... | +| fun2 | false | 655 | 655 | { ... } | +| fun2 | false | 656 | 656 | | +| fun2 | false | 657 | 657 | | +| fun2 | false | 658 | 658 | try { ... } | +| fun2 | false | 660 | 660 | 0 | +| fun2 | false | 661 | 661 | return ... | +| fun2 | false | 662 | 662 | { ... } | +| fun2 | true | 201 | 226 | | +| fun2 | true | 206 | 198 | | +| fun2 | true | 208 | 206 | | +| fun2 | true | 210 | 208 | | +| fun2 | true | 214 | 198 | | +| fun2 | true | 215 | 214 | | +| fun2 | true | 217 | 215 | | +| fun2 | true | 219 | 210 | | +| fun2 | true | 219 | 220 | | +| fun2 | true | 220 | 217 | | +| fun2 | true | 221 | 201 | | +| fun2 | true | 225 | 198 | | +| fun2 | true | 226 | 225 | | +| fun2 | true | 228 | 221 | | +| fun2 | true | 644 | 661 | | +| fun2 | true | 649 | 187 | | +| fun2 | true | 650 | 649 | | +| fun2 | true | 651 | 650 | | +| fun2 | true | 653 | 187 | | +| fun2 | true | 654 | 653 | | +| fun2 | true | 655 | 654 | | +| fun2 | true | 656 | 651 | | +| fun2 | true | 656 | 657 | | +| fun2 | true | 657 | 655 | | +| fun2 | true | 658 | 644 | | +| fun2 | true | 660 | 187 | | +| fun2 | true | 661 | 660 | | +| fun2 | true | 662 | 658 | | +| g | false | 309 | 309 | g | +| h | false | 319 | 319 | h | +| i | false | 334 | 334 | i | +| j | false | 344 | 344 | j | +| k | false | 355 | 355 | k | +| operator= | false | 140 | 140 | operator= | +| operator= | false | 147 | 147 | operator= | +| run_fun2 | false | 182 | 182 | run_fun2 | +| run_fun2 | false | 190 | 190 | call to fun2 | +| run_fun2 | false | 192 | 192 | ExprStmt | +| run_fun2 | false | 194 | 194 | return ... | +| run_fun2 | false | 196 | 196 | { ... } | +| run_fun2 | true | 190 | 194 | | +| run_fun2 | true | 192 | 190 | | +| run_fun2 | true | 194 | 182 | | +| run_fun2 | true | 196 | 192 | | diff --git a/cpp/ql/test/library-tests/clang_ms/element.expected b/cpp/ql/test/library-tests/clang_ms/element.expected index 763649f774f6..a44924bcbc7b 100644 --- a/cpp/ql/test/library-tests/clang_ms/element.expected +++ b/cpp/ql/test/library-tests/clang_ms/element.expected @@ -51,6 +51,7 @@ | file://:0:0:0:0 | __uptr | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | abstract | | file://:0:0:0:0 | atomic | | file://:0:0:0:0 | auto | @@ -60,12 +61,13 @@ | file://:0:0:0:0 | char16_t | | file://:0:0:0:0 | char32_t | | file://:0:0:0:0 | const | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | const mystruct | | file://:0:0:0:0 | const mystruct & | | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | decltype(nullptr) | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -104,6 +106,8 @@ | file://:0:0:0:0 | override | | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | private | | file://:0:0:0:0 | protected | | file://:0:0:0:0 | public | diff --git a/cpp/ql/test/library-tests/classes/base_classes/base_classes.expected b/cpp/ql/test/library-tests/classes/base_classes/base_classes.expected index eb6db93c3bfa..ed3c8ce78eb8 100644 --- a/cpp/ql/test/library-tests/classes/base_classes/base_classes.expected +++ b/cpp/ql/test/library-tests/classes/base_classes/base_classes.expected @@ -1,5 +1,6 @@ | base_classes.cpp:1:8:1:12 | empty | | | base_classes.cpp:4:8:4:15 | indirect | | +| base_classes.cpp:4:8:4:15 | indirect | | | base_classes.cpp:9:8:9:8 | S | empty | | base_classes.cpp:9:8:9:8 | S | empty | | file://:0:0:0:0 | __va_list_tag | | diff --git a/cpp/ql/test/library-tests/conditions/elements.expected b/cpp/ql/test/library-tests/conditions/elements.expected index 3a4d6ced0ed0..ec507ee9a924 100644 --- a/cpp/ql/test/library-tests/conditions/elements.expected +++ b/cpp/ql/test/library-tests/conditions/elements.expected @@ -30,6 +30,7 @@ | file://:0:0:0:0 | __uptr | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | abstract | | file://:0:0:0:0 | atomic | | file://:0:0:0:0 | auto | @@ -39,9 +40,10 @@ | file://:0:0:0:0 | char16_t | | file://:0:0:0:0 | char32_t | | file://:0:0:0:0 | const | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | decltype(nullptr) | | file://:0:0:0:0 | definition of | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -77,6 +79,8 @@ | file://:0:0:0:0 | optional | | file://:0:0:0:0 | overflow_arg_area | | file://:0:0:0:0 | override | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | private | | file://:0:0:0:0 | protected | | file://:0:0:0:0 | public | diff --git a/cpp/ql/test/library-tests/conditions/vars.expected b/cpp/ql/test/library-tests/conditions/vars.expected index f90baf9ebc17..e2395ad5141a 100644 --- a/cpp/ql/test/library-tests/conditions/vars.expected +++ b/cpp/ql/test/library-tests/conditions/vars.expected @@ -2,5 +2,7 @@ | file://:0:0:0:0 | fp_offset | | file://:0:0:0:0 | gp_offset | | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | test.cpp:3:12:3:12 | | diff --git a/cpp/ql/test/library-tests/controlflow/exits/exits.expected b/cpp/ql/test/library-tests/controlflow/exits/exits.expected index e50f4571d271..bcd6b2253449 100644 --- a/cpp/ql/test/library-tests/controlflow/exits/exits.expected +++ b/cpp/ql/test/library-tests/controlflow/exits/exits.expected @@ -1,5 +1,5 @@ -| file://:0:0:0:0 | operator= | __va_list_tag::operator= | returns | -| file://:0:0:0:0 | operator= | __va_list_tag::operator= | returns | +| file://:0:0:0:0 | operator= | operator= | returns | +| file://:0:0:0:0 | operator= | operator= | returns | | test.cpp:1:6:1:9 | exit | exit | exits | | test.cpp:2:6:2:10 | _exit | _exit | exits | | test.cpp:3:6:3:10 | abort | abort | exits | diff --git a/cpp/ql/test/library-tests/cpp_builtin_types/bool/Variables.expected b/cpp/ql/test/library-tests/cpp_builtin_types/bool/Variables.expected index 130e5f396ac9..cee1ff31e8e4 100644 --- a/cpp/ql/test/library-tests/cpp_builtin_types/bool/Variables.expected +++ b/cpp/ql/test/library-tests/cpp_builtin_types/bool/Variables.expected @@ -3,4 +3,6 @@ | file://:0:0:0:0 | fp_offset | file://:0:0:0:0 | unsigned int | | file://:0:0:0:0 | gp_offset | file://:0:0:0:0 | unsigned int | | file://:0:0:0:0 | overflow_arg_area | file://:0:0:0:0 | void * | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | reg_save_area | file://:0:0:0:0 | void * | diff --git a/cpp/ql/test/library-tests/cpp_builtin_types/wchar_t/Variables.expected b/cpp/ql/test/library-tests/cpp_builtin_types/wchar_t/Variables.expected index 8afb9b307a69..ae1905962b6b 100644 --- a/cpp/ql/test/library-tests/cpp_builtin_types/wchar_t/Variables.expected +++ b/cpp/ql/test/library-tests/cpp_builtin_types/wchar_t/Variables.expected @@ -2,4 +2,6 @@ | file://:0:0:0:0 | fp_offset | | file://:0:0:0:0 | gp_offset | | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | diff --git a/cpp/ql/test/library-tests/declaration/IsMember.expected b/cpp/ql/test/library-tests/declaration/IsMember.expected index 174b8745c854..788a6cea6c21 100644 --- a/cpp/ql/test/library-tests/declaration/IsMember.expected +++ b/cpp/ql/test/library-tests/declaration/IsMember.expected @@ -43,7 +43,5 @@ | declaration.cpp:122:5:122:20 | myMemberVariable | | file://:0:0:0:0 | fp_offset | | file://:0:0:0:0 | gp_offset | -| file://:0:0:0:0 | operator= | -| file://:0:0:0:0 | operator= | | file://:0:0:0:0 | overflow_arg_area | | file://:0:0:0:0 | reg_save_area | diff --git a/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected b/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected index 4f89ef48c486..47c5f075a412 100644 --- a/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected +++ b/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected @@ -6,7 +6,6 @@ | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | declaration of 1st parameter | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -61,7 +60,11 @@ | test.cpp:57:7:57:26 | definition of tmplClassProtoAndDef | | test.cpp:59:19:59:19 | definition of T | | test.cpp:60:6:60:29 | declaration of tmplInstantiatedFunction | +| test.cpp:60:33:60:33 | definition of t | +| test.cpp:60:33:60:33 | definition of t | | test.cpp:61:19:61:19 | definition of T | +| test.cpp:62:6:62:6 | definition of tmplInstantiatedFunction | +| test.cpp:62:6:62:6 | definition of tmplInstantiatedFunction | | test.cpp:62:6:62:29 | definition of tmplInstantiatedFunction | | test.cpp:62:33:62:33 | declaration of t | | test.cpp:62:33:62:33 | definition of t | diff --git a/cpp/ql/test/library-tests/declarationEntry/template/declarationEntry.expected b/cpp/ql/test/library-tests/declarationEntry/template/declarationEntry.expected index 9273ca6a569f..84b1e1bf4194 100644 --- a/cpp/ql/test/library-tests/declarationEntry/template/declarationEntry.expected +++ b/cpp/ql/test/library-tests/declarationEntry/template/declarationEntry.expected @@ -11,7 +11,7 @@ | src4.cpp:6:20:6:21 | definition of zz | | src5.cpp:5:16:5:19 | definition of elem | | src5.cpp:6:8:6:17 | definition of my_istream | -| src5.cpp:10:8:10:17 | declaration of my_istream | +| src5.cpp:10:8:10:23 | declaration of my_istream | | src5.fwd.hpp:6:17:6:20 | definition of elem | | src5.fwd.hpp:6:29:6:38 | declaration of my_istream | | src6.cpp:5:19:5:23 | definition of mis_c | diff --git a/cpp/ql/test/library-tests/declarationEntry/template/usertype.expected b/cpp/ql/test/library-tests/declarationEntry/template/usertype.expected index 30490ce36575..76c7d0ea2d23 100644 --- a/cpp/ql/test/library-tests/declarationEntry/template/usertype.expected +++ b/cpp/ql/test/library-tests/declarationEntry/template/usertype.expected @@ -11,5 +11,5 @@ | src4.cpp:4:7:4:20 | template_class<> | 1 | | src5.cpp:5:16:5:19 | elem | 1 | | src5.cpp:6:8:6:17 | my_istream | 1 | -| src5.cpp:10:8:10:17 | my_istream | 1 | +| src5.cpp:10:8:10:23 | my_istream | 1 | | src5.fwd.hpp:6:17:6:20 | elem | 1 | diff --git a/cpp/ql/test/library-tests/default_parameters/variables.expected b/cpp/ql/test/library-tests/default_parameters/variables.expected index 3dcb5d017f99..9763fd11f9cf 100644 --- a/cpp/ql/test/library-tests/default_parameters/variables.expected +++ b/cpp/ql/test/library-tests/default_parameters/variables.expected @@ -1,6 +1,8 @@ | file://:0:0:0:0 | fp_offset | 1 | | 1 | | | file://:0:0:0:0 | gp_offset | 1 | | 1 | | | file://:0:0:0:0 | overflow_arg_area | 1 | | 1 | | +| file://:0:0:0:0 | p#0 | 1 | | 1 | | +| file://:0:0:0:0 | p#0 | 1 | | 1 | | | file://:0:0:0:0 | reg_save_area | 1 | | 1 | | | test.cpp:2:21:2:21 | x | 1 | file://:0:0:0:0 initializer for x | 2 | test.cpp:2:25:2:26 10 | | test.cpp:2:21:2:21 | x | 1 | file://:0:0:0:0 initializer for x | 2 | test.cpp:3:9:3:9 3 | diff --git a/cpp/ql/test/library-tests/depends_friends/Friend1.expected b/cpp/ql/test/library-tests/depends_friends/Friend1.expected index 9099cc51c7a9..118d009352b2 100644 --- a/cpp/ql/test/library-tests/depends_friends/Friend1.expected +++ b/cpp/ql/test/library-tests/depends_friends/Friend1.expected @@ -1,4 +1,3 @@ -| file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | __va_list_tag | | friends.cpp:1:7:1:13 | Friend1 | friends.cpp:1:7:1:13 | Friend1 | | friends.cpp:10:7:10:13 | Friend2 | friends.cpp:10:7:10:13 | Friend2 | | friends.cpp:24:7:24:7 | C | friends.cpp:1:7:1:13 | Friend1 | diff --git a/cpp/ql/test/library-tests/depends_initializers/VariableInitializers.expected b/cpp/ql/test/library-tests/depends_initializers/VariableInitializers.expected index a7698cee885b..f126ef4c9eb0 100644 --- a/cpp/ql/test/library-tests/depends_initializers/VariableInitializers.expected +++ b/cpp/ql/test/library-tests/depends_initializers/VariableInitializers.expected @@ -9,6 +9,8 @@ | file://:0:0:0:0 | p#0 | 0 | 0 | | file://:0:0:0:0 | p#0 | 0 | 0 | | file://:0:0:0:0 | p#0 | 0 | 0 | +| file://:0:0:0:0 | p#0 | 0 | 0 | +| file://:0:0:0:0 | p#0 | 0 | 0 | | file://:0:0:0:0 | reg_save_area | 0 | 0 | | initializers.cpp:8:8:8:12 | a_ptr | 1 | 1 | | initializers.cpp:9:4:9:4 | a | 1 | 1 | diff --git a/cpp/ql/test/library-tests/derived_types/DerivedTypesBaseType.expected b/cpp/ql/test/library-tests/derived_types/DerivedTypesBaseType.expected index 68e2d7e841c2..bacdb9e73b3a 100644 --- a/cpp/ql/test/library-tests/derived_types/DerivedTypesBaseType.expected +++ b/cpp/ql/test/library-tests/derived_types/DerivedTypesBaseType.expected @@ -5,6 +5,9 @@ | file://:0:0:0:0 | CC * | derivedtype.cpp:5:11:5:12 | CC | | file://:0:0:0:0 | CC ** | file://:0:0:0:0 | CC * | | file://:0:0:0:0 | __va_list_tag & | file://:0:0:0:0 | __va_list_tag | +| file://:0:0:0:0 | __va_list_tag && | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | const C | derivedtype.cpp:1:7:1:7 | C | | file://:0:0:0:0 | const C & | file://:0:0:0:0 | const C | +| file://:0:0:0:0 | const __va_list_tag | file://:0:0:0:0 | __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | file://:0:0:0:0 | const __va_list_tag | | file://:0:0:0:0 | void * | file://:0:0:0:0 | void | diff --git a/cpp/ql/test/library-tests/destructors/cfg.expected b/cpp/ql/test/library-tests/destructors/cfg.expected index cf730468263e..25ad8aa9b3f9 100644 --- a/cpp/ql/test/library-tests/destructors/cfg.expected +++ b/cpp/ql/test/library-tests/destructors/cfg.expected @@ -1,38 +1,31 @@ -| C::C | false | 135 | 135 | C | -| C::C | false | 138 | 138 | C | -| C::operator= | false | 133 | 133 | operator= | -| C::~C | false | 137 | 137 | ~C | -| Class2::Class2 | false | 382 | 382 | Class2 | -| Class2::Class2 | false | 388 | 388 | return ... | -| Class2::Class2 | false | 390 | 390 | { ... } | -| Class2::Class2 | false | 395 | 395 | Class2 | -| Class2::Class2 | true | 388 | 382 | | -| Class2::Class2 | true | 390 | 388 | | -| Class2::operator= | false | 392 | 392 | operator= | -| Class2::~Class2 | false | 394 | 394 | ~Class2 | -| Outer::Inner::Inner | false | 429 | 429 | Inner | -| Outer::Inner::Inner | false | 434 | 434 | return ... | -| Outer::Inner::Inner | false | 436 | 436 | { ... } | -| Outer::Inner::Inner | false | 498 | 498 | Inner | -| Outer::Inner::Inner | true | 434 | 429 | | -| Outer::Inner::Inner | true | 436 | 434 | | -| Outer::Inner::operator= | false | 496 | 496 | operator= | +| C::C | false | 198 | 198 | C | +| C::C | false | 399 | 399 | C | +| C::operator= | false | 392 | 392 | operator= | +| C::~C | false | 332 | 332 | ~C | +| Class2::Class2 | false | 540 | 540 | Class2 | +| Class2::Class2 | false | 546 | 546 | return ... | +| Class2::Class2 | false | 548 | 548 | { ... } | +| Class2::Class2 | false | 549 | 549 | Class2 | +| Class2::Class2 | true | 546 | 540 | | +| Class2::Class2 | true | 548 | 546 | | +| Class2::operator= | false | 534 | 534 | operator= | +| Class2::~Class2 | false | 469 | 469 | ~Class2 | +| Outer::Inner::Inner | false | 490 | 490 | Inner | +| Outer::Inner::Inner | false | 511 | 511 | Inner | +| Outer::Inner::Inner | false | 530 | 530 | return ... | +| Outer::Inner::Inner | false | 532 | 532 | { ... } | +| Outer::Inner::Inner | true | 530 | 490 | | +| Outer::Inner::Inner | true | 532 | 530 | | +| Outer::Inner::operator= | false | 504 | 504 | operator= | | Outer::Inner::~Inner | false | 472 | 472 | ~Inner | -| Outer::Inner::~Inner | false | 476 | 476 | return ... | -| Outer::Inner::~Inner | false | 478 | 478 | { ... } | -| Outer::Inner::~Inner | true | 476 | 472 | | -| Outer::Inner::~Inner | true | 478 | 476 | | -| Outer::f2 | false | 411 | 411 | f2 | -| Outer::f2 | false | 417 | 417 | call to getClass2 | -| Outer::f2 | false | 419 | 419 | initializer for c | -| Outer::f2 | false | 424 | 424 | call to Inner | -| Outer::f2 | false | 438 | 438 | c | -| Outer::f2 | false | 440 | 440 | (const Class2)... | -| Outer::f2 | false | 442 | 442 | (reference to) | -| Outer::f2 | false | 444 | 444 | initializer for inner | -| Outer::f2 | false | 448 | 448 | declaration | -| Outer::f2 | false | 450 | 450 | i | -| Outer::f2 | false | 452 | 452 | (bool)... | +| Outer::Inner::~Inner | false | 519 | 519 | return ... | +| Outer::Inner::~Inner | false | 521 | 521 | { ... } | +| Outer::Inner::~Inner | true | 519 | 472 | | +| Outer::Inner::~Inner | true | 521 | 519 | | +| Outer::f2 | false | 441 | 441 | f2 | +| Outer::f2 | false | 449 | 449 | declaration | +| Outer::f2 | false | 451 | 451 | i | +| Outer::f2 | false | 453 | 453 | (bool)... | | Outer::f2 | false | 454 | 454 | return ... | | Outer::f2 | false | 456 | 456 | { ... } | | Outer::f2 | false | 458 | 458 | if (...) ... | @@ -41,215 +34,222 @@ | Outer::f2 | false | 464 | 464 | { ... } | | Outer::f2 | false | 466 | 466 | c | | Outer::f2 | false | 468 | 468 | call to c.~Class2 | -| Outer::f2 | false | 469 | 469 | inner | -| Outer::f2 | false | 470 | 470 | call to inner.~Inner | -| Outer::f2 | true | 417 | 458 | | -| Outer::f2 | true | 419 | 417 | | -| Outer::f2 | true | 424 | 462 | | -| Outer::f2 | true | 438 | 424 | | -| Outer::f2 | true | 444 | 438 | | -| Outer::f2 | true | 448 | 419 | | -| Outer::f2 | true | 450 | 456 | T | -| Outer::f2 | true | 450 | 460 | F | +| Outer::f2 | false | 470 | 470 | inner | +| Outer::f2 | false | 471 | 471 | call to inner.~Inner | +| Outer::f2 | false | 476 | 476 | call to getClass2 | +| Outer::f2 | false | 478 | 478 | initializer for c | +| Outer::f2 | false | 483 | 483 | call to Inner | +| Outer::f2 | false | 492 | 492 | c | +| Outer::f2 | false | 494 | 494 | (const Class2)... | +| Outer::f2 | false | 495 | 495 | (reference to) | +| Outer::f2 | false | 496 | 496 | initializer for inner | +| Outer::f2 | true | 449 | 478 | | +| Outer::f2 | true | 451 | 456 | T | +| Outer::f2 | true | 451 | 460 | F | | Outer::f2 | true | 454 | 466 | | | Outer::f2 | true | 456 | 454 | | -| Outer::f2 | true | 458 | 450 | | -| Outer::f2 | true | 460 | 444 | | -| Outer::f2 | true | 462 | 469 | | -| Outer::f2 | true | 464 | 448 | | +| Outer::f2 | true | 458 | 451 | | +| Outer::f2 | true | 460 | 496 | | +| Outer::f2 | true | 462 | 470 | | +| Outer::f2 | true | 464 | 449 | | | Outer::f2 | true | 466 | 468 | | -| Outer::f2 | true | 468 | 411 | | -| Outer::f2 | true | 469 | 470 | | -| Outer::f2 | true | 470 | 466 | | -| Outer::operator= | false | 481 | 481 | operator= | -| Outer::operator= | false | 485 | 485 | operator= | -| __va_list_tag::operator= | false | 64 | 64 | operator= | -| __va_list_tag::operator= | false | 68 | 68 | operator= | -| f | false | 152 | 152 | f | -| f | false | 158 | 158 | call to C | -| f | false | 162 | 162 | 110 | -| f | false | 163 | 163 | initializer for c10 | -| f | false | 168 | 168 | call to C | -| f | false | 172 | 172 | 111 | -| f | false | 173 | 173 | initializer for c11 | -| f | false | 178 | 178 | call to C | -| f | false | 182 | 182 | 120 | -| f | false | 183 | 183 | initializer for c20 | -| f | false | 188 | 188 | call to C | -| f | false | 192 | 192 | 121 | -| f | false | 193 | 193 | initializer for c21 | -| f | false | 198 | 198 | call to C | -| f | false | 202 | 202 | 130 | -| f | false | 203 | 203 | initializer for c30 | -| f | false | 208 | 208 | call to C | -| f | false | 212 | 212 | 131 | -| f | false | 213 | 213 | initializer for c31 | -| f | false | 218 | 218 | call to C | -| f | false | 222 | 222 | 132 | -| f | false | 223 | 223 | initializer for c32 | -| f | false | 228 | 228 | call to C | -| f | false | 232 | 232 | 133 | -| f | false | 233 | 233 | initializer for c33 | -| f | false | 238 | 238 | call to C | -| f | false | 242 | 242 | 134 | -| f | false | 243 | 243 | initializer for c34 | +| Outer::f2 | true | 468 | 441 | | +| Outer::f2 | true | 470 | 471 | | +| Outer::f2 | true | 471 | 466 | | +| Outer::f2 | true | 476 | 458 | | +| Outer::f2 | true | 478 | 476 | | +| Outer::f2 | true | 483 | 462 | | +| Outer::f2 | true | 492 | 483 | | +| Outer::f2 | true | 496 | 492 | | +| Outer::operator= | false | 426 | 426 | operator= | +| Outer::operator= | false | 437 | 437 | operator= | +| f | false | 182 | 182 | f | +| f | false | 193 | 193 | declaration | +| f | false | 196 | 196 | call to C | +| f | false | 201 | 201 | 120 | +| f | false | 202 | 202 | initializer for c20 | +| f | false | 206 | 206 | call to C | +| f | false | 210 | 210 | 121 | +| f | false | 211 | 211 | initializer for c21 | +| f | false | 214 | 214 | declaration | +| f | false | 217 | 217 | call to C | +| f | false | 221 | 221 | 130 | +| f | false | 222 | 222 | initializer for c30 | +| f | false | 225 | 225 | declaration | +| f | false | 227 | 227 | { ... } | +| f | false | 230 | 230 | call to C | +| f | false | 234 | 234 | 131 | +| f | false | 235 | 235 | initializer for c31 | +| f | false | 239 | 239 | call to C | +| f | false | 243 | 243 | 132 | +| f | false | 244 | 244 | initializer for c32 | | f | false | 248 | 248 | call to C | -| f | false | 252 | 252 | 122 | -| f | false | 253 | 253 | initializer for c22 | -| f | false | 258 | 258 | call to C | -| f | false | 262 | 262 | 123 | -| f | false | 263 | 263 | initializer for c23 | -| f | false | 267 | 267 | declaration | -| f | false | 269 | 269 | declaration | -| f | false | 271 | 271 | declaration | -| f | false | 273 | 273 | { ... } | -| f | false | 275 | 275 | declaration | -| f | false | 277 | 277 | b1 | -| f | false | 279 | 279 | (bool)... | -| f | false | 281 | 281 | goto ... | -| f | false | 283 | 283 | if (...) ... | -| f | false | 285 | 285 | declaration | -| f | false | 287 | 287 | b2 | -| f | false | 289 | 289 | (bool)... | -| f | false | 291 | 291 | return ... | -| f | false | 293 | 293 | if (...) ... | -| f | false | 295 | 295 | declaration | -| f | false | 297 | 297 | { ... } | -| f | false | 299 | 299 | declaration | -| f | false | 301 | 301 | { ... } | -| f | false | 303 | 303 | declaration | -| f | false | 305 | 305 | { ... } | -| f | false | 307 | 307 | declaration | -| f | false | 309 | 309 | { ... } | -| f | false | 311 | 311 | label ...: | -| f | false | 313 | 313 | declaration | -| f | false | 315 | 315 | { ... } | -| f | false | 317 | 317 | declaration | -| f | false | 319 | 319 | return ... | +| f | false | 252 | 252 | 133 | +| f | false | 253 | 253 | initializer for c33 | +| f | false | 256 | 256 | declaration | +| f | false | 258 | 258 | b1 | +| f | false | 260 | 260 | (bool)... | +| f | false | 261 | 261 | goto ... | +| f | false | 263 | 263 | if (...) ... | +| f | false | 265 | 265 | declaration | +| f | false | 267 | 267 | b2 | +| f | false | 269 | 269 | (bool)... | +| f | false | 270 | 270 | return ... | +| f | false | 272 | 272 | if (...) ... | +| f | false | 274 | 274 | declaration | +| f | false | 276 | 276 | { ... } | +| f | false | 279 | 279 | call to C | +| f | false | 283 | 283 | 134 | +| f | false | 284 | 284 | initializer for c34 | +| f | false | 287 | 287 | declaration | +| f | false | 289 | 289 | { ... } | +| f | false | 291 | 291 | declaration | +| f | false | 293 | 293 | { ... } | +| f | false | 296 | 296 | call to C | +| f | false | 300 | 300 | 122 | +| f | false | 301 | 301 | initializer for c22 | +| f | false | 304 | 304 | declaration | +| f | false | 306 | 306 | { ... } | +| f | false | 309 | 309 | call to C | +| f | false | 313 | 313 | 123 | +| f | false | 314 | 314 | initializer for c23 | +| f | false | 317 | 317 | label ...: | +| f | false | 319 | 319 | declaration | | f | false | 321 | 321 | { ... } | -| f | false | 323 | 323 | c10 | -| f | false | 325 | 325 | call to c10.~C | -| f | false | 326 | 326 | c11 | -| f | false | 327 | 327 | call to c11.~C | -| f | false | 328 | 328 | c23 | -| f | false | 330 | 330 | call to c23.~C | -| f | false | 331 | 331 | c22 | -| f | false | 333 | 333 | call to c22.~C | -| f | false | 334 | 334 | c20 | -| f | false | 336 | 336 | call to c20.~C | -| f | false | 337 | 337 | c21 | -| f | false | 338 | 338 | call to c21.~C | -| f | false | 339 | 339 | c34 | -| f | false | 341 | 341 | call to c34.~C | -| f | false | 342 | 342 | c31 | -| f | false | 344 | 344 | call to c31.~C | -| f | false | 345 | 345 | c32 | -| f | false | 346 | 346 | call to c32.~C | -| f | false | 347 | 347 | c33 | -| f | false | 348 | 348 | call to c33.~C | -| f | false | 349 | 349 | c20 | -| f | false | 350 | 350 | call to c20.~C | -| f | false | 351 | 351 | c31 | -| f | false | 352 | 352 | call to c31.~C | -| f | false | 353 | 353 | c32 | -| f | false | 354 | 354 | call to c32.~C | -| f | false | 355 | 355 | c20 | -| f | false | 356 | 356 | call to c20.~C | -| f | false | 357 | 357 | c31 | -| f | false | 358 | 358 | call to c31.~C | -| f | false | 359 | 359 | c30 | -| f | false | 361 | 361 | call to c30.~C | -| f | true | 158 | 305 | | -| f | true | 162 | 158 | | -| f | true | 163 | 162 | | -| f | true | 168 | 319 | | -| f | true | 172 | 168 | | -| f | true | 173 | 172 | | -| f | true | 178 | 273 | | -| f | true | 182 | 178 | | -| f | true | 183 | 182 | | -| f | true | 188 | 337 | | -| f | true | 192 | 188 | | -| f | true | 193 | 192 | | -| f | true | 198 | 359 | | -| f | true | 202 | 198 | | -| f | true | 203 | 202 | | -| f | true | 208 | 283 | | -| f | true | 212 | 208 | | -| f | true | 213 | 212 | | -| f | true | 218 | 293 | | -| f | true | 222 | 218 | | -| f | true | 223 | 222 | | -| f | true | 228 | 347 | | -| f | true | 232 | 228 | | -| f | true | 233 | 232 | | -| f | true | 238 | 339 | | -| f | true | 242 | 238 | | -| f | true | 243 | 242 | | -| f | true | 248 | 331 | | +| f | false | 323 | 323 | declaration | +| f | false | 325 | 325 | return ... | +| f | false | 327 | 327 | { ... } | +| f | false | 329 | 329 | c10 | +| f | false | 331 | 331 | call to c10.~C | +| f | false | 333 | 333 | c11 | +| f | false | 334 | 334 | call to c11.~C | +| f | false | 335 | 335 | c23 | +| f | false | 337 | 337 | call to c23.~C | +| f | false | 338 | 338 | c22 | +| f | false | 340 | 340 | call to c22.~C | +| f | false | 341 | 341 | c20 | +| f | false | 343 | 343 | call to c20.~C | +| f | false | 344 | 344 | c21 | +| f | false | 345 | 345 | call to c21.~C | +| f | false | 346 | 346 | c34 | +| f | false | 348 | 348 | call to c34.~C | +| f | false | 349 | 349 | c31 | +| f | false | 351 | 351 | call to c31.~C | +| f | false | 352 | 352 | c32 | +| f | false | 353 | 353 | call to c32.~C | +| f | false | 354 | 354 | c33 | +| f | false | 355 | 355 | call to c33.~C | +| f | false | 356 | 356 | c20 | +| f | false | 357 | 357 | call to c20.~C | +| f | false | 358 | 358 | c31 | +| f | false | 359 | 359 | call to c31.~C | +| f | false | 360 | 360 | c32 | +| f | false | 361 | 361 | call to c32.~C | +| f | false | 362 | 362 | c20 | +| f | false | 363 | 363 | call to c20.~C | +| f | false | 364 | 364 | c31 | +| f | false | 365 | 365 | call to c31.~C | +| f | false | 366 | 366 | c30 | +| f | false | 368 | 368 | call to c30.~C | +| f | false | 370 | 370 | call to C | +| f | false | 374 | 374 | 110 | +| f | false | 375 | 375 | initializer for c10 | +| f | false | 379 | 379 | call to C | +| f | false | 383 | 383 | 111 | +| f | false | 384 | 384 | initializer for c11 | +| f | true | 193 | 375 | | +| f | true | 196 | 227 | | +| f | true | 201 | 196 | | +| f | true | 202 | 201 | | +| f | true | 206 | 344 | | +| f | true | 210 | 206 | | +| f | true | 211 | 210 | | +| f | true | 214 | 202 | | +| f | true | 217 | 366 | | +| f | true | 221 | 217 | | +| f | true | 222 | 221 | | +| f | true | 225 | 222 | | +| f | true | 227 | 225 | | +| f | true | 230 | 263 | | +| f | true | 234 | 230 | | +| f | true | 235 | 234 | | +| f | true | 239 | 272 | | +| f | true | 243 | 239 | | +| f | true | 244 | 243 | | +| f | true | 248 | 354 | | | f | true | 252 | 248 | | | f | true | 253 | 252 | | -| f | true | 258 | 328 | | -| f | true | 262 | 258 | | -| f | true | 263 | 262 | | -| f | true | 267 | 163 | | -| f | true | 269 | 183 | | -| f | true | 271 | 203 | | -| f | true | 273 | 271 | | -| f | true | 275 | 213 | | -| f | true | 277 | 281 | T | -| f | true | 277 | 285 | F | -| f | true | 281 | 357 | | -| f | true | 283 | 277 | | -| f | true | 285 | 223 | | -| f | true | 287 | 291 | T | -| f | true | 287 | 295 | F | -| f | true | 291 | 353 | | -| f | true | 293 | 287 | | -| f | true | 295 | 233 | | -| f | true | 297 | 275 | | -| f | true | 299 | 243 | | -| f | true | 301 | 299 | | -| f | true | 303 | 193 | | -| f | true | 305 | 269 | | -| f | true | 307 | 253 | | -| f | true | 309 | 307 | | -| f | true | 311 | 313 | | -| f | true | 313 | 263 | | -| f | true | 315 | 311 | | -| f | true | 317 | 173 | | -| f | true | 319 | 326 | | -| f | true | 321 | 267 | | -| f | true | 323 | 325 | | -| f | true | 325 | 152 | | -| f | true | 326 | 327 | | -| f | true | 327 | 323 | | -| f | true | 328 | 330 | | -| f | true | 330 | 317 | | -| f | true | 331 | 333 | | -| f | true | 333 | 315 | | -| f | true | 334 | 336 | | -| f | true | 336 | 309 | | -| f | true | 337 | 338 | | -| f | true | 338 | 334 | | -| f | true | 339 | 341 | | -| f | true | 341 | 303 | | -| f | true | 342 | 344 | | -| f | true | 344 | 301 | | -| f | true | 345 | 346 | | -| f | true | 346 | 342 | | -| f | true | 347 | 348 | | -| f | true | 348 | 345 | | -| f | true | 349 | 350 | | -| f | true | 350 | 323 | | -| f | true | 351 | 352 | | -| f | true | 352 | 349 | | -| f | true | 353 | 354 | | -| f | true | 354 | 351 | | -| f | true | 355 | 356 | | -| f | true | 356 | 311 | | -| f | true | 357 | 358 | | -| f | true | 358 | 355 | | -| f | true | 359 | 361 | | -| f | true | 361 | 297 | | -| getClass2 | false | 405 | 405 | getClass2 | +| f | true | 256 | 235 | | +| f | true | 258 | 261 | T | +| f | true | 258 | 265 | F | +| f | true | 261 | 364 | | +| f | true | 263 | 258 | | +| f | true | 265 | 244 | | +| f | true | 267 | 270 | T | +| f | true | 267 | 274 | F | +| f | true | 270 | 360 | | +| f | true | 272 | 267 | | +| f | true | 274 | 253 | | +| f | true | 276 | 256 | | +| f | true | 279 | 346 | | +| f | true | 283 | 279 | | +| f | true | 284 | 283 | | +| f | true | 287 | 284 | | +| f | true | 289 | 287 | | +| f | true | 291 | 211 | | +| f | true | 293 | 214 | | +| f | true | 296 | 338 | | +| f | true | 300 | 296 | | +| f | true | 301 | 300 | | +| f | true | 304 | 301 | | +| f | true | 306 | 304 | | +| f | true | 309 | 335 | | +| f | true | 313 | 309 | | +| f | true | 314 | 313 | | +| f | true | 317 | 319 | | +| f | true | 319 | 314 | | +| f | true | 321 | 317 | | +| f | true | 323 | 384 | | +| f | true | 325 | 333 | | +| f | true | 327 | 193 | | +| f | true | 329 | 331 | | +| f | true | 331 | 182 | | +| f | true | 333 | 334 | | +| f | true | 334 | 329 | | +| f | true | 335 | 337 | | +| f | true | 337 | 323 | | +| f | true | 338 | 340 | | +| f | true | 340 | 321 | | +| f | true | 341 | 343 | | +| f | true | 343 | 306 | | +| f | true | 344 | 345 | | +| f | true | 345 | 341 | | +| f | true | 346 | 348 | | +| f | true | 348 | 291 | | +| f | true | 349 | 351 | | +| f | true | 351 | 289 | | +| f | true | 352 | 353 | | +| f | true | 353 | 349 | | +| f | true | 354 | 355 | | +| f | true | 355 | 352 | | +| f | true | 356 | 357 | | +| f | true | 357 | 329 | | +| f | true | 358 | 359 | | +| f | true | 359 | 356 | | +| f | true | 360 | 361 | | +| f | true | 361 | 358 | | +| f | true | 362 | 363 | | +| f | true | 363 | 317 | | +| f | true | 364 | 365 | | +| f | true | 365 | 362 | | +| f | true | 366 | 368 | | +| f | true | 368 | 276 | | +| f | true | 370 | 293 | | +| f | true | 374 | 370 | | +| f | true | 375 | 374 | | +| f | true | 379 | 325 | | +| f | true | 383 | 379 | | +| f | true | 384 | 383 | | +| getClass2 | false | 422 | 422 | getClass2 | +| operator= | false | 93 | 93 | operator= | +| operator= | false | 100 | 100 | operator= | diff --git a/cpp/ql/test/library-tests/floats/float128/functions.expected b/cpp/ql/test/library-tests/floats/float128/functions.expected index 75ed9f32d96f..d1412363d8f2 100644 --- a/cpp/ql/test/library-tests/floats/float128/functions.expected +++ b/cpp/ql/test/library-tests/floats/float128/functions.expected @@ -8,6 +8,8 @@ | operator= | file://:0:0:0:0 | __is_floating_point_helper & | file://:0:0:0:0 | const __is_floating_point_helper & | | operator= | file://:0:0:0:0 | __is_floating_point_helper & | file://:0:0:0:0 | __is_floating_point_helper && | | operator= | file://:0:0:0:0 | __is_floating_point_helper & | file://:0:0:0:0 | const __is_floating_point_helper & | +| operator= | file://:0:0:0:0 | __va_list_tag & | file://:0:0:0:0 | __va_list_tag && | +| operator= | file://:0:0:0:0 | __va_list_tag & | file://:0:0:0:0 | const __va_list_tag & | | operator= | file://:0:0:0:0 | false_type & | file://:0:0:0:0 | const false_type & | | operator= | file://:0:0:0:0 | false_type & | file://:0:0:0:0 | false_type && | | operator= | file://:0:0:0:0 | true_type & | file://:0:0:0:0 | const true_type & | diff --git a/cpp/ql/test/library-tests/functions/functions/FunctionCalls.expected b/cpp/ql/test/library-tests/functions/functions/FunctionCalls.expected index f06cec1daddd..6d6c1cb9ff12 100644 --- a/cpp/ql/test/library-tests/functions/functions/FunctionCalls.expected +++ b/cpp/ql/test/library-tests/functions/functions/FunctionCalls.expected @@ -1,3 +1,3 @@ -| ODASA-5186.cpp:17:13:17:13 | call to operator!= | file://:0:0:0:0 | operator!= | -| ODASA-5186.hpp:4:83:4:83 | call to operator== | ODASA-5186.cpp:5:8:5:17 | operator== | +| ODASA-5186.cpp:17:13:17:13 | call to operator!= | ODASA-5186.hpp:4:18:4:27 | operator!= | +| ODASA-5186.hpp:4:83:4:83 | call to operator== | ODASA-5186.cpp:5:8:5:8 | operator== | | functions.cpp:16:4:16:5 | call to ag | functions.cpp:11:7:11:8 | ag | diff --git a/cpp/ql/test/library-tests/functions/functions/Functions1.expected b/cpp/ql/test/library-tests/functions/functions/Functions1.expected index d812efa97390..20b892107223 100644 --- a/cpp/ql/test/library-tests/functions/functions/Functions1.expected +++ b/cpp/ql/test/library-tests/functions/functions/Functions1.expected @@ -1,14 +1,16 @@ | ODASA-5186.cpp:4:8:4:8 | operator= | operator= | | | ODASA-5186.cpp:4:8:4:8 | declaration | | ODASA-5186.cpp:4:8:4:8 | operator= | operator= | | | ODASA-5186.cpp:4:8:4:8 | declaration | +| ODASA-5186.cpp:5:8:5:8 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:8 | declaration | +| ODASA-5186.cpp:5:8:5:8 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:8 | definition | | ODASA-5186.cpp:5:8:5:17 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:17 | declaration | -| ODASA-5186.cpp:5:8:5:17 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:17 | declaration | -| ODASA-5186.cpp:5:8:5:17 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:17 | definition | | ODASA-5186.cpp:5:8:5:17 | operator== | operator== | | | ODASA-5186.cpp:5:8:5:17 | definition | | ODASA-5186.cpp:8:6:8:9 | test | test | isTopLevel | TopLevelFunction | ODASA-5186.cpp:8:6:8:9 | declaration | | ODASA-5186.cpp:8:6:8:9 | test | test | isTopLevel | TopLevelFunction | ODASA-5186.cpp:8:6:8:9 | definition | | ODASA-5186.hpp:2:8:2:8 | operator= | operator= | | | ODASA-5186.hpp:2:8:2:8 | declaration | | ODASA-5186.hpp:2:8:2:8 | operator= | operator= | | | ODASA-5186.hpp:2:8:2:8 | declaration | | ODASA-5186.hpp:4:18:4:27 | operator!= | operator!= | isTopLevel | TopLevelFunction | ODASA-5186.hpp:4:18:4:27 | declaration | +| ODASA-5186.hpp:4:18:4:27 | operator!= | operator!= | isTopLevel | TopLevelFunction | ODASA-5186.hpp:4:18:4:27 | declaration | +| ODASA-5186.hpp:4:18:4:27 | operator!= | operator!= | isTopLevel | TopLevelFunction | ODASA-5186.hpp:4:18:4:27 | definition | | ODASA-5186.hpp:4:18:4:27 | operator!= | operator!= | isTopLevel | TopLevelFunction | ODASA-5186.hpp:4:18:4:27 | definition | | functions.cpp:1:6:1:6 | f | f | isTopLevel | TopLevelFunction | functions.cpp:1:6:1:6 | declaration | | functions.cpp:1:6:1:6 | f | f | isTopLevel | TopLevelFunction | functions.cpp:1:6:1:6 | definition | diff --git a/cpp/ql/test/library-tests/functions/functions/Functions2.expected b/cpp/ql/test/library-tests/functions/functions/Functions2.expected index 91de943e049c..40f24edd5492 100644 --- a/cpp/ql/test/library-tests/functions/functions/Functions2.expected +++ b/cpp/ql/test/library-tests/functions/functions/Functions2.expected @@ -1,11 +1,9 @@ | ODASA-5186.cpp:4:8:4:14 | MyClass | Class | ODASA-5186.cpp:5:8:5:17 | operator== | member function | | ODASA-5186.cpp:4:8:4:14 | MyClass | Struct | ODASA-5186.cpp:4:8:4:8 | operator= | member function | | ODASA-5186.cpp:4:8:4:14 | MyClass | Struct | ODASA-5186.cpp:4:8:4:8 | operator= | member function | -| ODASA-5186.cpp:4:8:4:14 | MyClass | Struct | ODASA-5186.cpp:5:8:5:17 | operator== | member function | +| ODASA-5186.cpp:4:8:4:14 | MyClass | Struct | ODASA-5186.cpp:5:8:5:8 | operator== | member function | | ODASA-5186.hpp:2:8:2:17 | NEQ_helper> | Struct | ODASA-5186.hpp:2:8:2:8 | operator= | member function | | ODASA-5186.hpp:2:8:2:17 | NEQ_helper> | Struct | ODASA-5186.hpp:2:8:2:8 | operator= | member function | -| file://:0:0:0:0 | __va_list_tag | Struct | file://:0:0:0:0 | operator= | member function | -| file://:0:0:0:0 | __va_list_tag | Struct | file://:0:0:0:0 | operator= | member function | | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:7:8:7:8 | operator= | member function | | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:7:8:7:8 | operator= | member function | | functions.cpp:7:8:7:8 | A | Struct | functions.cpp:8:7:8:8 | af | member function | diff --git a/cpp/ql/test/library-tests/functions/qualifiers/test.expected b/cpp/ql/test/library-tests/functions/qualifiers/test.expected index a7f8ef34c91d..0e60569320eb 100644 --- a/cpp/ql/test/library-tests/functions/qualifiers/test.expected +++ b/cpp/ql/test/library-tests/functions/qualifiers/test.expected @@ -1 +1,2 @@ | file://:0:0:0:0 | ..(..) | true | +| file://:0:0:0:0 | const __va_list_tag | true | diff --git a/cpp/ql/test/library-tests/instantiations/test.expected b/cpp/ql/test/library-tests/instantiations/test.expected index 44db55b6b37d..3e23680b5fbb 100644 --- a/cpp/ql/test/library-tests/instantiations/test.expected +++ b/cpp/ql/test/library-tests/instantiations/test.expected @@ -28,6 +28,6 @@ | test.cpp:19:7:19:7 | C | | test.cpp:19:7:19:7 | operator= | | test.cpp:19:7:19:7 | operator= | -| test.cpp:21:18:21:21 | vfun | +| test.cpp:21:18:21:18 | vfun | | test.cpp:21:18:21:21 | vfun | | test.cpp:27:6:27:6 | f | diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected index 884abe554a61..f1bb034f586d 100644 --- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected +++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected @@ -1,7 +1,3 @@ -#-----| __va_list_tag::operator=() -> __va_list_tag & -#-----| params: -#-----| __va_list_tag::operator=() -> __va_list_tag & -#-----| params: #-----| operator delete(void *, unsigned long) -> void #-----| params: #-----| 0: p#0 @@ -34,6 +30,14 @@ #-----| Type = unsigned long #-----| 1: p#1 #-----| Type = align_val_t +#-----| operator=(__va_list_tag &&) -> __va_list_tag & +#-----| params: +#-----| 0: p#0 +#-----| Type = __va_list_tag && +#-----| operator=(const __va_list_tag &) -> __va_list_tag & +#-----| params: +#-----| 0: p#0 +#-----| Type = const __va_list_tag & ir.cpp: # 1| Constants() -> void # 1| params: diff --git a/cpp/ql/test/library-tests/lambdas/captures/elements.expected b/cpp/ql/test/library-tests/lambdas/captures/elements.expected index 52f85b0392df..384744c10800 100644 --- a/cpp/ql/test/library-tests/lambdas/captures/elements.expected +++ b/cpp/ql/test/library-tests/lambdas/captures/elements.expected @@ -115,7 +115,10 @@ | file://:0:0:0:0 | ..(*)(..) | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | auto | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | const foo | | file://:0:0:0:0 | const foo & | | file://:0:0:0:0 | const lambda [] type at line 3, col. 5 | @@ -142,7 +145,6 @@ | file://:0:0:0:0 | decltype([...](...){...}) | | file://:0:0:0:0 | decltype([...](...){...}) | | file://:0:0:0:0 | decltype([...](...){...}) | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -176,6 +178,8 @@ | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | file://:0:0:0:0 | this | | file://:0:0:0:0 | this | diff --git a/cpp/ql/test/library-tests/lambdas/cfg/cfg.expected b/cpp/ql/test/library-tests/lambdas/cfg/cfg.expected index cd73b85be0cb..a9b3cca49263 100644 --- a/cpp/ql/test/library-tests/lambdas/cfg/cfg.expected +++ b/cpp/ql/test/library-tests/lambdas/cfg/cfg.expected @@ -1,103 +1,103 @@ -| | false | 102 | 102 | operator() | -| | false | 108 | 108 | declaration | -| | false | 110 | 110 | call to printf | -| | false | 114 | 114 | Running with %d and %d\n | -| | false | 115 | 115 | array to pointer conversion | -| | false | 117 | 117 | (char *)... | -| | false | 119 | 119 | x | -| | false | 121 | 121 | y | -| | false | 123 | 123 | ExprStmt | -| | false | 125 | 125 | z | -| | false | 127 | 127 | x | -| | false | 129 | 129 | y | -| | false | 131 | 131 | ... + ... | -| | false | 133 | 133 | ... = ... | -| | false | 135 | 135 | ExprStmt | -| | false | 137 | 137 | call to printf | -| | false | 141 | 141 | Returning %d %d\n | -| | false | 142 | 142 | array to pointer conversion | -| | false | 144 | 144 | (char *)... | -| | false | 146 | 146 | z | -| | false | 148 | 148 | z | -| | false | 150 | 150 | ExprStmt | -| | false | 152 | 152 | z | -| | false | 154 | 154 | return ... | -| | false | 156 | 156 | { ... } | -| | false | 160 | 160 | operator auto (*)(int, int)->int | -| | false | 161 | 161 | _FUN | -| | false | 164 | 164 | _FUN | -| | false | 166 | 166 | return ... | -| | false | 168 | 168 | { ... } | +| | false | 154 | 154 | (constructor) | +| | false | 157 | 157 | (constructor) | +| | false | 164 | 164 | return ... | +| | false | 166 | 166 | { ... } | +| | false | 167 | 167 | operator= | | | false | 173 | 173 | (constructor) | -| | false | 175 | 175 | return ... | -| | false | 177 | 177 | { ... } | -| | false | 183 | 183 | (constructor) | -| | false | 186 | 186 | operator= | -| | false | 188 | 188 | (constructor) | -| | true | 108 | 123 | | -| | true | 110 | 135 | | -| | true | 114 | 119 | | -| | true | 119 | 121 | | -| | true | 121 | 110 | | -| | true | 123 | 114 | | -| | true | 125 | 133 | | -| | true | 127 | 129 | | -| | true | 129 | 131 | | -| | true | 131 | 125 | | -| | true | 133 | 150 | | -| | true | 135 | 127 | | -| | true | 137 | 154 | | -| | true | 141 | 146 | | -| | true | 146 | 148 | | -| | true | 148 | 137 | | -| | true | 150 | 141 | | -| | true | 152 | 102 | | -| | true | 154 | 152 | | -| | true | 156 | 108 | | -| | true | 164 | 160 | | +| | false | 175 | 175 | _FUN | +| | false | 184 | 184 | operator auto (*)(int, int)->int | +| | false | 190 | 190 | _FUN | +| | false | 192 | 192 | return ... | +| | false | 194 | 194 | { ... } | +| | false | 195 | 195 | operator() | +| | false | 206 | 206 | declaration | +| | false | 212 | 212 | call to printf | +| | false | 220 | 220 | Running with %d and %d\n | +| | false | 221 | 221 | array to pointer conversion | +| | false | 222 | 222 | (char *)... | +| | false | 223 | 223 | x | +| | false | 225 | 225 | y | +| | false | 227 | 227 | ExprStmt | +| | false | 232 | 232 | z | +| | false | 234 | 234 | x | +| | false | 236 | 236 | y | +| | false | 238 | 238 | ... + ... | +| | false | 240 | 240 | ... = ... | +| | false | 242 | 242 | ExprStmt | +| | false | 244 | 244 | call to printf | +| | false | 250 | 250 | Returning %d %d\n | +| | false | 251 | 251 | array to pointer conversion | +| | false | 252 | 252 | (char *)... | +| | false | 253 | 253 | z | +| | false | 255 | 255 | z | +| | false | 257 | 257 | ExprStmt | +| | false | 259 | 259 | z | +| | false | 261 | 261 | return ... | +| | false | 263 | 263 | { ... } | +| | true | 164 | 157 | | | | true | 166 | 164 | | -| | true | 168 | 166 | | -| | true | 175 | 173 | | -| | true | 177 | 175 | | -| __va_list_tag::operator= | false | 60 | 60 | operator= | -| __va_list_tag::operator= | false | 66 | 66 | operator= | -| main | false | 95 | 95 | main | -| main | false | 199 | 199 | [...](...){...} | -| main | false | 201 | 201 | initializer for myLambda | -| main | false | 205 | 205 | declaration | -| main | false | 207 | 207 | call to printf | -| main | false | 213 | 213 | Some results: %d %d\n | -| main | false | 214 | 214 | array to pointer conversion | -| main | false | 216 | 216 | (char *)... | -| main | false | 220 | 220 | call to operator() | -| main | false | 222 | 222 | myLambda | -| main | false | 224 | 224 | (const lambda [] type at line 12, col. 21)... | -| main | false | 228 | 228 | 5 | -| main | false | 231 | 231 | 6 | -| main | false | 232 | 232 | call to operator() | -| main | false | 234 | 234 | myLambda | -| main | false | 236 | 236 | (const lambda [] type at line 12, col. 21)... | -| main | false | 240 | 240 | 7 | -| main | false | 243 | 243 | 8 | -| main | false | 244 | 244 | ExprStmt | -| main | false | 248 | 248 | 0 | -| main | false | 249 | 249 | return ... | -| main | false | 251 | 251 | { ... } | -| main | true | 199 | 244 | | -| main | true | 201 | 199 | | -| main | true | 205 | 201 | | -| main | true | 207 | 249 | | -| main | true | 213 | 228 | | -| main | true | 220 | 240 | | -| main | true | 222 | 220 | | -| main | true | 228 | 231 | | -| main | true | 231 | 222 | | -| main | true | 232 | 207 | | -| main | true | 234 | 232 | | -| main | true | 240 | 243 | | -| main | true | 243 | 234 | | -| main | true | 244 | 213 | | -| main | true | 248 | 95 | | -| main | true | 249 | 248 | | -| main | true | 251 | 205 | | -| printf | false | 84 | 84 | printf | +| | true | 190 | 184 | | +| | true | 192 | 190 | | +| | true | 194 | 192 | | +| | true | 206 | 227 | | +| | true | 212 | 242 | | +| | true | 220 | 223 | | +| | true | 223 | 225 | | +| | true | 225 | 212 | | +| | true | 227 | 220 | | +| | true | 232 | 240 | | +| | true | 234 | 236 | | +| | true | 236 | 238 | | +| | true | 238 | 232 | | +| | true | 240 | 257 | | +| | true | 242 | 234 | | +| | true | 244 | 261 | | +| | true | 250 | 253 | | +| | true | 253 | 255 | | +| | true | 255 | 244 | | +| | true | 257 | 250 | | +| | true | 259 | 195 | | +| | true | 261 | 259 | | +| | true | 263 | 206 | | +| main | false | 147 | 147 | main | +| main | false | 269 | 269 | declaration | +| main | false | 271 | 271 | call to printf | +| main | false | 277 | 277 | Some results: %d %d\n | +| main | false | 278 | 278 | array to pointer conversion | +| main | false | 279 | 279 | (char *)... | +| main | false | 282 | 282 | call to operator() | +| main | false | 285 | 285 | [...](...){...} | +| main | false | 287 | 287 | initializer for myLambda | +| main | false | 291 | 291 | myLambda | +| main | false | 293 | 293 | (const lambda [] type at line 12, col. 21)... | +| main | false | 296 | 296 | 5 | +| main | false | 299 | 299 | 6 | +| main | false | 300 | 300 | call to operator() | +| main | false | 302 | 302 | myLambda | +| main | false | 304 | 304 | (const lambda [] type at line 12, col. 21)... | +| main | false | 307 | 307 | 7 | +| main | false | 310 | 310 | 8 | +| main | false | 311 | 311 | ExprStmt | +| main | false | 315 | 315 | 0 | +| main | false | 316 | 316 | return ... | +| main | false | 318 | 318 | { ... } | +| main | true | 269 | 287 | | +| main | true | 271 | 316 | | +| main | true | 277 | 296 | | +| main | true | 282 | 307 | | +| main | true | 285 | 311 | | +| main | true | 287 | 285 | | +| main | true | 291 | 282 | | +| main | true | 296 | 299 | | +| main | true | 299 | 291 | | +| main | true | 300 | 271 | | +| main | true | 302 | 300 | | +| main | true | 307 | 310 | | +| main | true | 310 | 302 | | +| main | true | 311 | 277 | | +| main | true | 315 | 147 | | +| main | true | 316 | 315 | | +| main | true | 318 | 269 | | +| operator= | false | 92 | 92 | operator= | +| operator= | false | 99 | 99 | operator= | +| printf | false | 209 | 209 | printf | diff --git a/cpp/ql/test/library-tests/locations/calls/calls.expected b/cpp/ql/test/library-tests/locations/calls/calls.expected index 0d47ee9aed8e..d17e8f5ac062 100644 --- a/cpp/ql/test/library-tests/locations/calls/calls.expected +++ b/cpp/ql/test/library-tests/locations/calls/calls.expected @@ -1,6 +1,6 @@ -| holder.cpp:13:2:13:20 | call to Holder | holder.cpp:5:2:5:7 | Holder | -| holder.cpp:17:14:17:15 | call to Holder | holder.cpp:5:2:5:7 | Holder | -| holder.cpp:18:18:18:31 | call to Holder | holder.cpp:5:2:5:7 | Holder | -| holder.cpp:19:2:19:3 | call to Holder | holder.cpp:6:2:6:7 | Holder | -| holder.cpp:19:5:19:5 | call to operator+ | holder.cpp:12:11:12:19 | operator+ | -| holder.cpp:19:7:19:8 | call to Holder | holder.cpp:6:2:6:7 | Holder | +| holder.cpp:13:2:13:20 | call to Holder | holder.cpp:5:2:5:2 | Holder | +| holder.cpp:17:14:17:15 | call to Holder | holder.cpp:5:2:5:2 | Holder | +| holder.cpp:18:18:18:31 | call to Holder | holder.cpp:5:2:5:2 | Holder | +| holder.cpp:19:2:19:3 | call to Holder | holder.cpp:6:2:6:2 | Holder | +| holder.cpp:19:5:19:5 | call to operator+ | holder.cpp:12:11:12:11 | operator+ | +| holder.cpp:19:7:19:8 | call to Holder | holder.cpp:6:2:6:2 | Holder | diff --git a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected index 487f23c7baeb..580e3da83569 100644 --- a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected +++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected @@ -1,5 +1,8 @@ +| file://:0:0:0:0 | __va_list_tag | false | | file://:0:0:0:0 | operator= | false | | file://:0:0:0:0 | operator= | false | +| file://:0:0:0:0 | p#0 | false | +| 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 | declaration of operator= | false | diff --git a/cpp/ql/test/library-tests/members/getters/members.expected b/cpp/ql/test/library-tests/members/getters/members.expected index ce7b7f6e56b0..56f72afa5dc0 100644 --- a/cpp/ql/test/library-tests/members/getters/members.expected +++ b/cpp/ql/test/library-tests/members/getters/members.expected @@ -1,24 +1,26 @@ +| file://:0:0:0:0 | | file://:0:0:0:0 | operator= | operator=(__va_list_tag &&) | Orphan | +| file://:0:0:0:0 | | file://:0:0:0:0 | operator= | operator=(const __va_list_tag &) | Orphan | | file://:0:0:0:0 | | test.cpp:34:6:34:6 | g | g() | Orphan | -| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(C &&) | getAMember(), getAMember(5), getAMemberFunction(), getCanonicalMember(5), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(const C &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C(T) | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C(double) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C(int) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D(T) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() | -| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D(int) | getAMember(), getAMember(1), getAMemberFunction(), 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 | 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:23 | f_template_C_D | D::f_template_C_D(T) | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() | -| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:23 | f_template_C_D | D::f_template_C_D(double) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() | -| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:21 | f_template_D | D::f_template_D(T) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() | -| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:21 | f_template_D | D::f_template_D(double) | getAMember(), getAMember(1), getAMemberFunction(), getDeclaringType() | -| test.cpp:14:7:14:7 | D | test.cpp:22:10:22:14 | f_C_D | D::f_C_D() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() | -| test.cpp:14:7:14:7 | D | test.cpp:23:10:23:12 | f_D | D::f_D() | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:29:10:29:12 | f_E | E::f_E() | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:31:10:31:16 | f_E_arg | E::f_E_arg(E) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:27:7:27:7 | operator= | E::operator=(E &&) | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:27:7:27:7 | operator= | E::operator=(const E &) | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:29:10:29:12 | f_E | E::f_E() | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() | -| test.cpp:27:7:27:7 | E | test.cpp:31:10:31:16 | f_E_arg | E::f_E_arg(E) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(C &&) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(const C &) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C(int) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:10 | f_template_C_D | C::f_template_C_D(int) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:10:10:10:12 | f_C | C::f_C() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:2:7:2:7 | C | test.cpp:11:10:11:14 | f_C_D | C::f_C_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(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(const D &) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:10 | f_template_C_D | D::f_template_C_D(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:23 | f_template_C_D | D::f_template_C_D(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:10 | f_template_D | D::f_template_D(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:21 | f_template_D | D::f_template_D(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:22:10:22:14 | f_C_D | D::f_C_D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:14:7:14:7 | D | test.cpp:23:10:23:12 | f_D | D::f_D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:29:10:29:12 | f_E | E::f_E() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:31:10:31:16 | f_E_arg | E::f_E_arg(E) | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:27:7:27:7 | operator= | E::operator=(E &&) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:27:7:27:7 | operator= | E::operator=(const E &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:29:10:29:10 | f_E | E::f_E() | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() | +| test.cpp:27:7:27:7 | E | test.cpp:31:10:31:10 | f_E_arg | E::f_E_arg(E) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() | diff --git a/cpp/ql/test/library-tests/members/templates/members.expected b/cpp/ql/test/library-tests/members/templates/members.expected index 770b85cc7b66..2779a3d17ea2 100644 --- a/cpp/ql/test/library-tests/members/templates/members.expected +++ b/cpp/ql/test/library-tests/members/templates/members.expected @@ -2,18 +2,12 @@ | file://:0:0:0:0 | __va_list_tag | 1 __va_list_tag::fp_offset | | file://:0:0:0:0 | __va_list_tag | 2 __va_list_tag::overflow_arg_area | | file://:0:0:0:0 | __va_list_tag | 3 __va_list_tag::reg_save_area | -| file://:0:0:0:0 | __va_list_tag | 4 __va_list_tag::operator= | -| file://:0:0:0:0 | __va_list_tag | 5 __va_list_tag::operator= | | h.h:2:7:2:8 | CA | 0 CA::CB | | h.h:2:7:2:8 | CA | 0 CA::CB | | h.h:2:7:2:8 | CA | 0 CA::CB | | h.h:2:7:2:8 | CA | 0 CA::CB | -| h.h:2:7:2:8 | CA | 1 CA::operator= | -| h.h:2:7:2:8 | CA | 2 CA::operator= | +| h.h:2:7:2:8 | CA | 3 CA::operator= | | h.h:5:11:5:12 | CB | | -| h.h:5:11:5:12 | CB | 0 CA::CB::operator= | -| h.h:5:11:5:12 | CB | 1 CA::CB::operator= | -| h.h:5:11:5:12 | CB | 0 CA::CB::operator= | -| h.h:5:11:5:12 | CB | 1 CA::CB::operator= | -| h.h:5:11:5:12 | CB | 0 CA::CB::operator= | -| h.h:5:11:5:12 | CB | 1 CA::CB::operator= | +| h.h:5:11:5:12 | CB | 2 CA::CB::operator= | +| h.h:5:11:5:12 | CB | 2 CA::CB::operator= | +| h.h:5:11:5:12 | CB | 2 CA::CB::operator= | diff --git a/cpp/ql/test/library-tests/namespaces/namespaces/decls.expected b/cpp/ql/test/library-tests/namespaces/namespaces/decls.expected index 16f6b2bc855a..2626d7ca67bc 100644 --- a/cpp/ql/test/library-tests/namespaces/namespaces/decls.expected +++ b/cpp/ql/test/library-tests/namespaces/namespaces/decls.expected @@ -1,9 +1,11 @@ | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | __va_list_tag | __va_list_tag | true | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | fp_offset | __va_list_tag::fp_offset | false | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | gp_offset | __va_list_tag::gp_offset | false | -| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | __va_list_tag::operator= | false | -| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | __va_list_tag::operator= | false | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | operator= | true | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | operator= | true | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | overflow_arg_area | __va_list_tag::overflow_arg_area | false | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | p#0 | | false | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | p#0 | | false | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | reg_save_area | __va_list_tag::reg_save_area | false | | file://:0:0:0:0 | (global namespace) | namespaces.cpp:40:5:40:13 | globalInt | globalInt | true | | file://:0:0:0:0 | (global namespace) | namespaces.cpp:42:6:42:18 | globalIntUser | globalIntUser | true | diff --git a/cpp/ql/test/library-tests/namespaces/same_name/decls.expected b/cpp/ql/test/library-tests/namespaces/same_name/decls.expected index 3d72020f4c4b..8a6d70aee19f 100644 --- a/cpp/ql/test/library-tests/namespaces/same_name/decls.expected +++ b/cpp/ql/test/library-tests/namespaces/same_name/decls.expected @@ -4,6 +4,8 @@ | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | reg_save_area | | same_name.cpp:4:11:4:21 | namespace_a | same_name.cpp:2:11:2:11 | c | | same_name.cpp:4:11:4:21 | namespace_a | same_name.cpp:6:12:6:12 | c | diff --git a/cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected b/cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected index 91a180f53fd2..e44efaad881d 100644 --- a/cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected +++ b/cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected @@ -3,7 +3,6 @@ | copy_from_prototype.cpp:3:7:3:7 | operator= | a::operator=(a &&) | copy_from_prototype.cpp:3:7:3:7 | a | | | copy_from_prototype.cpp:3:7:3:7 | operator= | a::operator=(const a &) | copy_from_prototype.cpp:3:7:3:7 | a | | | copy_from_prototype.cpp:4:26:4:26 | a | a<>::a<(unnamed)>() | copy_from_prototype.cpp:3:7:3:7 | a<> | 123 | -| copy_from_prototype.cpp:4:26:4:26 | a | a::a() | copy_from_prototype.cpp:3:7:3:7 | a | | | copy_from_prototype.cpp:4:26:4:26 | a | a::a<(unnamed)>() | copy_from_prototype.cpp:3:7:3:7 | a | | | copy_from_prototype.cpp:7:7:7:7 | b | b::b() | copy_from_prototype.cpp:7:7:7:7 | b | | | copy_from_prototype.cpp:7:7:7:7 | b | b::b(b &&) | copy_from_prototype.cpp:7:7:7:7 | b | | @@ -15,7 +14,6 @@ | copy_from_prototype.cpp:13:7:13:7 | operator= | c::operator=(c &&) | copy_from_prototype.cpp:13:7:13:7 | c | | | copy_from_prototype.cpp:13:7:13:7 | operator= | c::operator=(const c &) | copy_from_prototype.cpp:13:7:13:7 | c | | | copy_from_prototype.cpp:14:26:14:26 | c | c::c<(unnamed)>() | copy_from_prototype.cpp:13:7:13:7 | c | Unknown literal | -| copy_from_prototype.cpp:14:26:14:26 | c | c::c() | copy_from_prototype.cpp:13:7:13:7 | c | | | copy_from_prototype.cpp:14:26:14:26 | c | c::c<(unnamed)>() | copy_from_prototype.cpp:13:7:13:7 | c | | | copy_from_prototype.cpp:17:7:17:7 | d | d::d() | copy_from_prototype.cpp:17:7:17:7 | d | | | copy_from_prototype.cpp:17:7:17:7 | d | d::d(const d &) | copy_from_prototype.cpp:17:7:17:7 | d | | @@ -28,5 +26,3 @@ | copy_from_prototype.cpp:22:8:22:8 | operator= | e::operator=(e &&) | copy_from_prototype.cpp:22:8:22:8 | e | | | copy_from_prototype.cpp:23:26:23:26 | e | e::e<(unnamed)>() | copy_from_prototype.cpp:22:8:22:8 | e | 456 | | copy_from_prototype.cpp:26:35:26:43 | e | e::e<(unnamed)>() | copy_from_prototype.cpp:22:8:22:8 | e | 456 | -| file://:0:0:0:0 | operator= | __va_list_tag::operator=() | file://:0:0:0:0 | __va_list_tag | | -| file://:0:0:0:0 | operator= | __va_list_tag::operator=() | file://:0:0:0:0 | __va_list_tag | | diff --git a/cpp/ql/test/library-tests/noexcept/noexcept/noexcept_specifier.expected b/cpp/ql/test/library-tests/noexcept/noexcept/noexcept_specifier.expected index 7d367b1674c6..344551c24aa4 100644 --- a/cpp/ql/test/library-tests/noexcept/noexcept/noexcept_specifier.expected +++ b/cpp/ql/test/library-tests/noexcept/noexcept/noexcept_specifier.expected @@ -15,7 +15,15 @@ | box.h:2:8:2:8 | definition of Box | no except | --- | | box.h:2:8:2:8 | definition of Box | no except | --- | | box.h:2:8:2:8 | definition of Box | no except | --- | +| box.h:3:3:3:3 | definition of Box | -------- | __has_nothrow_copy | +| box.h:3:3:3:3 | definition of Box | -------- | __has_nothrow_copy | +| box.h:3:3:3:3 | definition of Box | -------- | __has_nothrow_copy | +| box.h:3:3:3:3 | definition of Box | -------- | __has_nothrow_copy | | box.h:3:3:3:5 | definition of Box | -------- | __has_nothrow_copy | +| box.h:9:15:9:15 | definition of box | -------- | --- | +| box.h:9:15:9:15 | definition of box | -------- | --- | +| box.h:9:15:9:15 | definition of box | -------- | --- | +| box.h:9:15:9:15 | definition of box | -------- | --- | | box.h:9:15:9:17 | definition of box | -------- | --- | | noexcept.cpp:2:7:2:7 | declaration of operator= | -------- | --- | | noexcept.cpp:2:7:2:7 | declaration of operator= | -------- | --- | diff --git a/cpp/ql/test/library-tests/numlines/numlines.expected b/cpp/ql/test/library-tests/numlines/numlines.expected index 9aa1c5c016c7..3feca61fd693 100644 --- a/cpp/ql/test/library-tests/numlines/numlines.expected +++ b/cpp/ql/test/library-tests/numlines/numlines.expected @@ -1,6 +1,5 @@ | C::ff() | 4 | 4 | 0 | | C::gg(T) | 4 | 4 | 0 | -| C::gg(T) | 10 | 7 | 0 | | conventional() | 4 | 4 | 1 | | hh() | 4 | 4 | 0 | | long_char() | 3 | 3 | 0 | diff --git a/cpp/ql/test/library-tests/parameters/parameters/Parameters1.expected b/cpp/ql/test/library-tests/parameters/parameters/Parameters1.expected index bb7a28a21b7d..5001757b461d 100644 --- a/cpp/ql/test/library-tests/parameters/parameters/Parameters1.expected +++ b/cpp/ql/test/library-tests/parameters/parameters/Parameters1.expected @@ -1,5 +1,5 @@ -| file://:0:0:0:0 | operator= | 0 | -| file://:0:0:0:0 | operator= | 0 | +| file://:0:0:0:0 | operator= | 1 | +| file://:0:0:0:0 | operator= | 1 | | parameters.cpp:3:5:3:14 | Callback_1 | 2 | | parameters.cpp:8:5:8:14 | Callback_2 | 2 | | parameters.cpp:13:5:13:14 | Callback_3 | 2 | diff --git a/cpp/ql/test/library-tests/pointsto/basic/sets.expected b/cpp/ql/test/library-tests/pointsto/basic/sets.expected index e8f6b7169dad..94f869bd29be 100644 --- a/cpp/ql/test/library-tests/pointsto/basic/sets.expected +++ b/cpp/ql/test/library-tests/pointsto/basic/sets.expected @@ -3,167 +3,173 @@ | pointsto | false | 2 | 2 | set: {overflow_arg_area} | | pointsto | false | 3 | 3 | set: {reg_save_area} | | pointsto | false | 4 | 4 | set: {operator=} | -| pointsto | false | 5 | 5 | set: {operator=} | -| pointsto | false | 6 | 6 | set: {MyStruct} | -| pointsto | false | 7 | 7 | set: {data} | -| pointsto | false | 8 | 8 | set: {operator=} | -| pointsto | false | 9 | 9 | set: {p#0} | -| pointsto | false | 10 | 10 | set: {operator=} | -| pointsto | false | 11 | 11 | set: {p#0} | -| pointsto | false | 12 | 12 | set: {(unsigned long)..., 10} | -| pointsto | false | 13 | 13 | set: {use} | -| pointsto | false | 14 | 14 | set: {v} | -| pointsto | false | 15 | 15 | set: {test} | -| pointsto | false | 16 | 16 | set: {cond} | -| pointsto | false | 17 | 17 | set: {(bool)..., cond} | -| pointsto | false | 18 | 18 | set: {p1, p1, p1} | -| pointsto | false | 19 | 19 | set: {a, a} | -| pointsto | false | 20 | 20 | set: {b, b} | -| pointsto | false | 21 | 21 | set: {p2, p2} | -| pointsto | false | 22 | 22 | set: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} | -| pointsto | false | 23 | 23 | set: {c, c} | -| pointsto | false | 24 | 24 | set: {pp1, pp1} | -| pointsto | false | 25 | 25 | set: {d, d} | -| pointsto | false | 26 | 26 | set: {pp2, pp2} | -| pointsto | false | 27 | 27 | set: {a, b, c, d} | -| pointsto | false | 28 | 28 | set: {& ..., & ..., ... = ..., ... = ..., p3} | -| pointsto | false | 29 | 29 | set: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} | -| pointsto | false | 79 | 79 | file://:0:0:0:0\ngp_offset | -| pointsto | false | 80 | 80 | file://:0:0:0:0\nfp_offset | -| pointsto | false | 81 | 81 | file://:0:0:0:0\noverflow_arg_area | -| pointsto | false | 82 | 82 | file://:0:0:0:0\nreg_save_area | -| pointsto | false | 83 | 83 | \noperator= | -| pointsto | false | 85 | 85 | \noperator= | -| pointsto | false | 88 | 88 | test.cpp:2:16:2:23\nMyStruct | -| pointsto | false | 89 | 89 | test.cpp:3:6:3:9\ndata | -| pointsto | false | 91 | 91 | test.cpp:2:16:2:16\noperator= | -| pointsto | false | 92 | 92 | file://:0:0:0:0\np#0 | -| pointsto | false | 95 | 95 | test.cpp:2:16:2:16\noperator= | -| pointsto | false | 96 | 96 | file://:0:0:0:0\np#0 | -| pointsto | false | 99 | 99 | test.cpp:3:11:3:12\n10 | -| pointsto | false | 100 | 100 | test.cpp:3:11:3:12\n(unsigned long)... | -| pointsto | false | 104 | 104 | test.cpp:6:10:6:10\na | -| pointsto | false | 106 | 106 | test.cpp:6:13:6:13\nb | -| pointsto | false | 108 | 108 | test.cpp:6:16:6:16\nc | -| pointsto | false | 110 | 110 | test.cpp:6:19:6:19\nd | -| pointsto | false | 112 | 112 | test.cpp:7:11:7:12\np1 | -| pointsto | false | 116 | 116 | test.cpp:7:16:7:17\np2 | -| pointsto | false | 118 | 118 | test.cpp:7:21:7:22\np3 | -| pointsto | false | 120 | 120 | test.cpp:8:12:8:14\npp1 | -| pointsto | false | 124 | 124 | test.cpp:8:19:8:21\npp2 | -| pointsto | false | 126 | 126 | test.cpp:10:6:10:8\nuse | -| pointsto | false | 127 | 127 | test.cpp:10:19:10:19\nv | -| pointsto | false | 130 | 130 | test.cpp:12:6:12:9\ntest | -| pointsto | false | 131 | 131 | test.cpp:12:15:12:18\ncond | -| pointsto | false | 132 | 132 | test.cpp:14:6:14:9\ncond | -| pointsto | false | 133 | 133 | test.cpp:14:6:14:9\n(bool)... | -| pointsto | false | 134 | 134 | test.cpp:16:3:16:4\np1 | -| pointsto | false | 135 | 135 | test.cpp:16:9:16:9\na | -| pointsto | false | 136 | 136 | test.cpp:16:8:16:9\n& ... | -| pointsto | false | 137 | 137 | test.cpp:16:3:16:9\n... = ... | -| pointsto | false | 140 | 140 | test.cpp:18:3:18:4\np1 | -| pointsto | false | 141 | 141 | test.cpp:18:9:18:9\nb | -| pointsto | false | 142 | 142 | test.cpp:18:8:18:9\n& ... | -| pointsto | false | 143 | 143 | test.cpp:18:3:18:9\n... = ... | -| pointsto | false | 148 | 148 | test.cpp:20:2:20:3\np2 | -| pointsto | false | 149 | 149 | test.cpp:20:7:20:8\np1 | -| pointsto | false | 150 | 150 | test.cpp:20:2:20:8\n... = ... | -| pointsto | false | 152 | 152 | test.cpp:22:2:22:3\np3 | -| pointsto | false | 153 | 153 | test.cpp:22:8:22:8\nc | -| pointsto | false | 154 | 154 | test.cpp:22:7:22:8\n& ... | -| pointsto | false | 155 | 155 | test.cpp:22:2:22:8\n... = ... | -| pointsto | false | 157 | 157 | test.cpp:23:2:23:4\npp1 | -| pointsto | false | 158 | 158 | test.cpp:23:9:23:10\np3 | -| pointsto | false | 159 | 159 | test.cpp:23:8:23:10\n& ... | -| pointsto | false | 160 | 160 | test.cpp:23:2:23:10\n... = ... | -| pointsto | false | 162 | 162 | test.cpp:24:2:24:3\np3 | -| pointsto | false | 163 | 163 | test.cpp:24:8:24:8\nd | -| pointsto | false | 164 | 164 | test.cpp:24:7:24:8\n& ... | -| pointsto | false | 165 | 165 | test.cpp:24:2:24:8\n... = ... | -| pointsto | false | 168 | 168 | test.cpp:25:2:25:4\npp2 | -| pointsto | false | 169 | 169 | test.cpp:25:9:25:10\np3 | -| pointsto | false | 170 | 170 | test.cpp:25:8:25:10\n& ... | -| pointsto | false | 171 | 171 | test.cpp:25:2:25:10\n... = ... | -| pointsto | false | 176 | 176 | test.cpp:27:6:27:6\na | -| pointsto | false | 177 | 177 | test.cpp:27:9:27:9\nb | -| pointsto | false | 178 | 178 | test.cpp:27:12:27:12\nc | -| pointsto | false | 179 | 179 | test.cpp:27:15:27:15\nd | -| pointsto | false | 180 | 180 | test.cpp:27:18:27:19\np1 | -| pointsto | false | 181 | 181 | test.cpp:27:22:27:23\np2 | -| pointsto | false | 182 | 182 | test.cpp:27:26:27:27\np3 | -| pointsto | false | 183 | 183 | test.cpp:27:30:27:32\npp1 | -| pointsto | false | 184 | 184 | test.cpp:27:35:27:37\npp2 | -| pointsto | true | 0 | 79 | pt: {gp_offset} -> gp_offset | -| pointsto | true | 1 | 80 | pt: {fp_offset} -> fp_offset | -| pointsto | true | 2 | 81 | pt: {overflow_arg_area} -> overflow_arg_area | -| pointsto | true | 3 | 82 | pt: {reg_save_area} -> reg_save_area | -| pointsto | true | 4 | 83 | pt: {operator=} -> operator= | -| pointsto | true | 5 | 85 | pt: {operator=} -> operator= | -| pointsto | true | 6 | 88 | pt: {MyStruct} -> MyStruct | -| pointsto | true | 7 | 89 | pt: {data} -> data | -| pointsto | true | 8 | 91 | pt: {operator=} -> operator= | -| pointsto | true | 9 | 92 | pt: {p#0} -> p#0 | -| pointsto | true | 10 | 95 | pt: {operator=} -> operator= | -| pointsto | true | 11 | 96 | pt: {p#0} -> p#0 | -| pointsto | true | 12 | 99 | pt: {(unsigned long)..., 10} -> 10 | -| pointsto | true | 12 | 100 | pt: {(unsigned long)..., 10} -> (unsigned long)... | -| pointsto | true | 13 | 126 | pt: {use} -> use | -| pointsto | true | 14 | 6 | sf | -| pointsto | true | 14 | 127 | pt: {v} -> v | -| pointsto | true | 15 | 130 | pt: {test} -> test | -| pointsto | true | 16 | 131 | pt: {cond} -> cond | -| pointsto | true | 17 | 132 | pt: {(bool)..., cond} -> cond | -| pointsto | true | 17 | 133 | pt: {(bool)..., cond} -> (bool)... | -| pointsto | true | 18 | 112 | pt: {p1, p1, p1} -> p1 | -| pointsto | true | 18 | 134 | pt: {p1, p1, p1} -> p1 | -| pointsto | true | 18 | 140 | pt: {p1, p1, p1} -> p1 | -| pointsto | true | 19 | 6 | sf | -| pointsto | true | 19 | 22 | sf | -| pointsto | true | 19 | 104 | pt: {a, a} -> a | -| pointsto | true | 19 | 135 | pt: {a, a} -> a | -| pointsto | true | 20 | 6 | sf | -| pointsto | true | 20 | 22 | sf | -| pointsto | true | 20 | 106 | pt: {b, b} -> b | -| pointsto | true | 20 | 141 | pt: {b, b} -> b | -| pointsto | true | 21 | 116 | pt: {p2, p2} -> p2 | -| pointsto | true | 21 | 148 | pt: {p2, p2} -> p2 | -| pointsto | true | 22 | 136 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> & ... | -| pointsto | true | 22 | 137 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | -| pointsto | true | 22 | 142 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> & ... | -| pointsto | true | 22 | 143 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | -| pointsto | true | 22 | 149 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p1 | -| pointsto | true | 22 | 150 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | -| pointsto | true | 22 | 180 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p1 | -| pointsto | true | 22 | 181 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p2 | -| pointsto | true | 23 | 6 | sf | -| pointsto | true | 23 | 28 | sf | -| pointsto | true | 23 | 108 | pt: {c, c} -> c | -| pointsto | true | 23 | 153 | pt: {c, c} -> c | -| pointsto | true | 24 | 120 | pt: {pp1, pp1} -> pp1 | -| pointsto | true | 24 | 157 | pt: {pp1, pp1} -> pp1 | -| pointsto | true | 25 | 6 | sf | -| pointsto | true | 25 | 28 | sf | -| pointsto | true | 25 | 110 | pt: {d, d} -> d | -| pointsto | true | 25 | 163 | pt: {d, d} -> d | -| pointsto | true | 26 | 124 | pt: {pp2, pp2} -> pp2 | -| pointsto | true | 26 | 168 | pt: {pp2, pp2} -> pp2 | -| pointsto | true | 27 | 176 | pt: {a, b, c, d} -> a | -| pointsto | true | 27 | 177 | pt: {a, b, c, d} -> b | -| pointsto | true | 27 | 178 | pt: {a, b, c, d} -> c | -| pointsto | true | 27 | 179 | pt: {a, b, c, d} -> d | -| pointsto | true | 28 | 154 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> & ... | -| pointsto | true | 28 | 155 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> ... = ... | -| pointsto | true | 28 | 164 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> & ... | -| pointsto | true | 28 | 165 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> ... = ... | -| pointsto | true | 28 | 182 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> p3 | -| pointsto | true | 29 | 118 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | -| pointsto | true | 29 | 152 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | -| pointsto | true | 29 | 158 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | -| pointsto | true | 29 | 159 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> & ... | -| pointsto | true | 29 | 160 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> ... = ... | -| pointsto | true | 29 | 162 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | -| pointsto | true | 29 | 169 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | -| pointsto | true | 29 | 170 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> & ... | -| pointsto | true | 29 | 171 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> ... = ... | -| pointsto | true | 29 | 183 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> pp1 | -| pointsto | true | 29 | 184 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> pp2 | +| pointsto | false | 5 | 5 | set: {p#0} | +| pointsto | false | 6 | 6 | set: {operator=} | +| pointsto | false | 7 | 7 | set: {p#0} | +| pointsto | false | 8 | 8 | set: {MyStruct} | +| pointsto | false | 9 | 9 | set: {test} | +| pointsto | false | 10 | 10 | set: {cond} | +| pointsto | false | 11 | 11 | set: {(bool)..., cond} | +| pointsto | false | 12 | 12 | set: {p1, p1, p1} | +| pointsto | false | 13 | 13 | set: {a, a} | +| pointsto | false | 14 | 14 | set: {b, b} | +| pointsto | false | 15 | 15 | set: {p2, p2} | +| pointsto | false | 16 | 16 | set: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} | +| pointsto | false | 17 | 17 | set: {c, c} | +| pointsto | false | 18 | 18 | set: {pp1, pp1} | +| pointsto | false | 19 | 19 | set: {d, d} | +| pointsto | false | 20 | 20 | set: {pp2, pp2} | +| pointsto | false | 21 | 21 | set: {use} | +| pointsto | false | 22 | 22 | set: {a, b, c, d} | +| pointsto | false | 23 | 23 | set: {& ..., & ..., ... = ..., ... = ..., p3} | +| pointsto | false | 24 | 24 | set: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} | +| pointsto | false | 25 | 25 | set: {v} | +| pointsto | false | 26 | 26 | set: {operator=} | +| pointsto | false | 27 | 27 | set: {p#0} | +| pointsto | false | 28 | 28 | set: {operator=} | +| pointsto | false | 29 | 29 | set: {p#0} | +| pointsto | false | 30 | 30 | set: {data} | +| pointsto | false | 31 | 31 | set: {(unsigned long)..., 10} | +| pointsto | false | 94 | 94 | file://:0:0:0:0\ngp_offset | +| pointsto | false | 96 | 96 | file://:0:0:0:0\nfp_offset | +| pointsto | false | 98 | 98 | file://:0:0:0:0\noverflow_arg_area | +| pointsto | false | 101 | 101 | file://:0:0:0:0\nreg_save_area | +| pointsto | false | 104 | 104 | \noperator= | +| pointsto | false | 105 | 105 | \np#0 | +| pointsto | false | 109 | 109 | \noperator= | +| pointsto | false | 110 | 110 | \np#0 | +| pointsto | false | 156 | 156 | test.cpp:2:16:2:23\nMyStruct | +| pointsto | false | 161 | 161 | test.cpp:12:6:12:9\ntest | +| pointsto | false | 162 | 162 | test.cpp:12:15:12:18\ncond | +| pointsto | false | 165 | 165 | test.cpp:14:6:14:9\ncond | +| pointsto | false | 166 | 166 | test.cpp:14:6:14:9\n(bool)... | +| pointsto | false | 169 | 169 | test.cpp:7:11:7:12\np1 | +| pointsto | false | 170 | 170 | test.cpp:16:3:16:4\np1 | +| pointsto | false | 171 | 171 | test.cpp:6:10:6:10\na | +| pointsto | false | 172 | 172 | test.cpp:16:9:16:9\na | +| pointsto | false | 173 | 173 | test.cpp:16:8:16:9\n& ... | +| pointsto | false | 174 | 174 | test.cpp:16:3:16:9\n... = ... | +| pointsto | false | 177 | 177 | test.cpp:18:3:18:4\np1 | +| pointsto | false | 178 | 178 | test.cpp:6:13:6:13\nb | +| pointsto | false | 179 | 179 | test.cpp:18:9:18:9\nb | +| pointsto | false | 180 | 180 | test.cpp:18:8:18:9\n& ... | +| pointsto | false | 181 | 181 | test.cpp:18:3:18:9\n... = ... | +| pointsto | false | 185 | 185 | test.cpp:7:16:7:17\np2 | +| pointsto | false | 186 | 186 | test.cpp:20:2:20:3\np2 | +| pointsto | false | 187 | 187 | test.cpp:20:7:20:8\np1 | +| pointsto | false | 188 | 188 | test.cpp:20:2:20:8\n... = ... | +| pointsto | false | 190 | 190 | test.cpp:7:21:7:22\np3 | +| pointsto | false | 191 | 191 | test.cpp:22:2:22:3\np3 | +| pointsto | false | 192 | 192 | test.cpp:6:16:6:16\nc | +| pointsto | false | 193 | 193 | test.cpp:22:8:22:8\nc | +| pointsto | false | 194 | 194 | test.cpp:22:7:22:8\n& ... | +| pointsto | false | 195 | 195 | test.cpp:22:2:22:8\n... = ... | +| pointsto | false | 199 | 199 | test.cpp:8:12:8:14\npp1 | +| pointsto | false | 200 | 200 | test.cpp:23:2:23:4\npp1 | +| pointsto | false | 201 | 201 | test.cpp:23:9:23:10\np3 | +| pointsto | false | 202 | 202 | test.cpp:23:8:23:10\n& ... | +| pointsto | false | 203 | 203 | test.cpp:23:2:23:10\n... = ... | +| pointsto | false | 205 | 205 | test.cpp:24:2:24:3\np3 | +| pointsto | false | 206 | 206 | test.cpp:6:19:6:19\nd | +| pointsto | false | 207 | 207 | test.cpp:24:8:24:8\nd | +| pointsto | false | 208 | 208 | test.cpp:24:7:24:8\n& ... | +| pointsto | false | 209 | 209 | test.cpp:24:2:24:8\n... = ... | +| pointsto | false | 211 | 211 | test.cpp:8:19:8:21\npp2 | +| pointsto | false | 212 | 212 | test.cpp:25:2:25:4\npp2 | +| pointsto | false | 213 | 213 | test.cpp:25:9:25:10\np3 | +| pointsto | false | 214 | 214 | test.cpp:25:8:25:10\n& ... | +| pointsto | false | 215 | 215 | test.cpp:25:2:25:10\n... = ... | +| pointsto | false | 217 | 217 | test.cpp:10:6:10:8\nuse | +| pointsto | false | 221 | 221 | test.cpp:27:6:27:6\na | +| pointsto | false | 222 | 222 | test.cpp:27:9:27:9\nb | +| pointsto | false | 223 | 223 | test.cpp:27:12:27:12\nc | +| pointsto | false | 224 | 224 | test.cpp:27:15:27:15\nd | +| pointsto | false | 225 | 225 | test.cpp:27:18:27:19\np1 | +| pointsto | false | 226 | 226 | test.cpp:27:22:27:23\np2 | +| pointsto | false | 227 | 227 | test.cpp:27:26:27:27\np3 | +| pointsto | false | 228 | 228 | test.cpp:27:30:27:32\npp1 | +| pointsto | false | 229 | 229 | test.cpp:27:35:27:37\npp2 | +| pointsto | false | 233 | 233 | test.cpp:10:19:10:19\nv | +| pointsto | false | 235 | 235 | test.cpp:2:16:2:16\noperator= | +| pointsto | false | 237 | 237 | file://:0:0:0:0\np#0 | +| pointsto | false | 242 | 242 | test.cpp:2:16:2:16\noperator= | +| pointsto | false | 243 | 243 | file://:0:0:0:0\np#0 | +| pointsto | false | 247 | 247 | test.cpp:3:6:3:9\ndata | +| pointsto | false | 250 | 250 | test.cpp:3:11:3:12\n10 | +| pointsto | false | 251 | 251 | test.cpp:3:11:3:12\n(unsigned long)... | +| pointsto | true | 0 | 94 | pt: {gp_offset} -> gp_offset | +| pointsto | true | 1 | 96 | pt: {fp_offset} -> fp_offset | +| pointsto | true | 2 | 98 | pt: {overflow_arg_area} -> overflow_arg_area | +| pointsto | true | 3 | 101 | pt: {reg_save_area} -> reg_save_area | +| pointsto | true | 4 | 104 | pt: {operator=} -> operator= | +| pointsto | true | 5 | 105 | pt: {p#0} -> p#0 | +| pointsto | true | 6 | 109 | pt: {operator=} -> operator= | +| pointsto | true | 7 | 110 | pt: {p#0} -> p#0 | +| pointsto | true | 8 | 156 | pt: {MyStruct} -> MyStruct | +| pointsto | true | 9 | 161 | pt: {test} -> test | +| pointsto | true | 10 | 162 | pt: {cond} -> cond | +| pointsto | true | 11 | 165 | pt: {(bool)..., cond} -> cond | +| pointsto | true | 11 | 166 | pt: {(bool)..., cond} -> (bool)... | +| pointsto | true | 12 | 169 | pt: {p1, p1, p1} -> p1 | +| pointsto | true | 12 | 170 | pt: {p1, p1, p1} -> p1 | +| pointsto | true | 12 | 177 | pt: {p1, p1, p1} -> p1 | +| pointsto | true | 13 | 8 | sf | +| pointsto | true | 13 | 16 | sf | +| pointsto | true | 13 | 171 | pt: {a, a} -> a | +| pointsto | true | 13 | 172 | pt: {a, a} -> a | +| pointsto | true | 14 | 8 | sf | +| pointsto | true | 14 | 16 | sf | +| pointsto | true | 14 | 178 | pt: {b, b} -> b | +| pointsto | true | 14 | 179 | pt: {b, b} -> b | +| pointsto | true | 15 | 185 | pt: {p2, p2} -> p2 | +| pointsto | true | 15 | 186 | pt: {p2, p2} -> p2 | +| pointsto | true | 16 | 173 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> & ... | +| pointsto | true | 16 | 174 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | +| pointsto | true | 16 | 180 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> & ... | +| pointsto | true | 16 | 181 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | +| pointsto | true | 16 | 187 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p1 | +| pointsto | true | 16 | 188 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> ... = ... | +| pointsto | true | 16 | 225 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p1 | +| pointsto | true | 16 | 226 | pt: {& ..., & ..., ... = ..., ... = ..., ... = ..., p1, p1, p2} -> p2 | +| pointsto | true | 17 | 8 | sf | +| pointsto | true | 17 | 23 | sf | +| pointsto | true | 17 | 192 | pt: {c, c} -> c | +| pointsto | true | 17 | 193 | pt: {c, c} -> c | +| pointsto | true | 18 | 199 | pt: {pp1, pp1} -> pp1 | +| pointsto | true | 18 | 200 | pt: {pp1, pp1} -> pp1 | +| pointsto | true | 19 | 8 | sf | +| pointsto | true | 19 | 23 | sf | +| pointsto | true | 19 | 206 | pt: {d, d} -> d | +| pointsto | true | 19 | 207 | pt: {d, d} -> d | +| pointsto | true | 20 | 211 | pt: {pp2, pp2} -> pp2 | +| pointsto | true | 20 | 212 | pt: {pp2, pp2} -> pp2 | +| pointsto | true | 21 | 217 | pt: {use} -> use | +| pointsto | true | 22 | 221 | pt: {a, b, c, d} -> a | +| pointsto | true | 22 | 222 | pt: {a, b, c, d} -> b | +| pointsto | true | 22 | 223 | pt: {a, b, c, d} -> c | +| pointsto | true | 22 | 224 | pt: {a, b, c, d} -> d | +| pointsto | true | 23 | 194 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> & ... | +| pointsto | true | 23 | 195 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> ... = ... | +| pointsto | true | 23 | 208 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> & ... | +| pointsto | true | 23 | 209 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> ... = ... | +| pointsto | true | 23 | 227 | pt: {& ..., & ..., ... = ..., ... = ..., p3} -> p3 | +| pointsto | true | 24 | 190 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | +| pointsto | true | 24 | 191 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | +| pointsto | true | 24 | 201 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | +| pointsto | true | 24 | 202 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> & ... | +| pointsto | true | 24 | 203 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> ... = ... | +| pointsto | true | 24 | 205 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | +| pointsto | true | 24 | 213 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> p3 | +| pointsto | true | 24 | 214 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> & ... | +| pointsto | true | 24 | 215 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> ... = ... | +| pointsto | true | 24 | 228 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> pp1 | +| pointsto | true | 24 | 229 | pt: {& ..., & ..., ... = ..., ... = ..., p3, p3, p3, p3, p3, pp1, pp2} -> pp2 | +| pointsto | true | 25 | 8 | sf | +| pointsto | true | 25 | 233 | pt: {v} -> v | +| pointsto | true | 26 | 235 | pt: {operator=} -> operator= | +| pointsto | true | 27 | 237 | pt: {p#0} -> p#0 | +| pointsto | true | 28 | 242 | pt: {operator=} -> operator= | +| pointsto | true | 29 | 243 | pt: {p#0} -> p#0 | +| pointsto | true | 30 | 247 | pt: {data} -> data | +| pointsto | true | 31 | 250 | pt: {(unsigned long)..., 10} -> 10 | +| pointsto | true | 31 | 251 | pt: {(unsigned long)..., 10} -> (unsigned long)... | diff --git a/cpp/ql/test/library-tests/qualifiers/class-enum/decls.expected b/cpp/ql/test/library-tests/qualifiers/class-enum/decls.expected index ddf489bd4df9..12376f9890f1 100644 --- a/cpp/ql/test/library-tests/qualifiers/class-enum/decls.expected +++ b/cpp/ql/test/library-tests/qualifiers/class-enum/decls.expected @@ -1,8 +1,8 @@ | file://:0:0:0:0 | __va_list_tag | __va_list_tag | | file://:0:0:0:0 | fp_offset | __va_list_tag::fp_offset | | file://:0:0:0:0 | gp_offset | __va_list_tag::gp_offset | -| file://:0:0:0:0 | operator= | __va_list_tag::operator= | -| file://:0:0:0:0 | operator= | __va_list_tag::operator= | +| file://:0:0:0:0 | operator= | operator= | +| file://:0:0:0:0 | operator= | operator= | | file://:0:0:0:0 | overflow_arg_area | __va_list_tag::overflow_arg_area | | file://:0:0:0:0 | reg_save_area | __va_list_tag::reg_save_area | | test.cpp:2:7:2:7 | operator= | MyEnumClass::operator= | diff --git a/cpp/ql/test/library-tests/scopes/parents/parents.expected b/cpp/ql/test/library-tests/scopes/parents/parents.expected index 523d0884393b..29a6825dd118 100644 --- a/cpp/ql/test/library-tests/scopes/parents/parents.expected +++ b/cpp/ql/test/library-tests/scopes/parents/parents.expected @@ -1,11 +1,13 @@ | 0 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | __va_list_tag | +| 0 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | +| 0 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | | 0 | file://:0:0:0:0 | (global namespace) | parents.cpp:2:11:2:13 | foo | | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | fp_offset | | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | gp_offset | -| 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | operator= | -| 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | operator= | | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | overflow_arg_area | | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | reg_save_area | +| 1 | file://:0:0:0:0 | operator= | file://:0:0:0:0 | p#0 | +| 1 | file://:0:0:0:0 | operator= | file://:0:0:0:0 | p#0 | | 1 | parents.cpp:2:11:2:13 | foo | parents.cpp:3:13:3:15 | foo::bar | | 1 | parents.cpp:3:13:3:15 | foo::bar | parents.cpp:4:10:4:10 | f | | 1 | parents.cpp:4:10:4:10 | f | parents.cpp:4:16:4:16 | i | diff --git a/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected b/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected index 01915a9253ed..1f569f3b1b66 100644 --- a/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected +++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes1.expected @@ -1,5 +1,7 @@ | file://:0:0:0:0 | (global namespace) | GlobalNamespace | file://:0:0:0:0 | operator delete[] | | | file://:0:0:0:0 | (global namespace) | GlobalNamespace | file://:0:0:0:0 | operator new[] | | +| file://:0:0:0:0 | (global namespace) | GlobalNamespace | file://:0:0:0:0 | operator= | | +| file://:0:0:0:0 | (global namespace) | GlobalNamespace | file://:0:0:0:0 | operator= | | | file://:0:0:0:0 | (global namespace) | GlobalNamespace | scopes.cpp:2:7:2:7 | A | Class | | file://:0:0:0:0 | (global namespace) | GlobalNamespace | scopes.cpp:7:7:7:7 | B | Class | | file://:0:0:0:0 | (global namespace) | GlobalNamespace | scopes.cpp:11:7:11:7 | C | Class | @@ -13,8 +15,6 @@ | file://:0:0:0:0 | (global namespace) | GlobalNamespace | scopes.cpp:74:11:74:13 | One | Namespace | | file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | fp_offset | | | file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | gp_offset | | -| file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | operator= | | -| file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | operator= | | | file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | overflow_arg_area | | | file://:0:0:0:0 | __va_list_tag | Class | file://:0:0:0:0 | reg_save_area | | | scopes.cpp:2:7:2:7 | A | Class | scopes.cpp:2:7:2:7 | operator= | | diff --git a/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected b/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected index af73b99dff8d..c2f077dcacb4 100644 --- a/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected +++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes3.expected @@ -1,5 +1,3 @@ -| file://:0:0:0:0 | operator= | | file://:0:0:0:0 | __va_list_tag | 6 | -| file://:0:0:0:0 | operator= | | file://:0:0:0:0 | __va_list_tag | 6 | | scopes.cpp:2:7:2:7 | operator= | | scopes.cpp:2:7:2:7 | A | 2 | | 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 | diff --git a/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected b/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected index 5a4c8bcf4af7..95119e756fae 100644 --- a/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected +++ b/cpp/ql/test/library-tests/scopes/scopes/Scopes4.expected @@ -1,7 +1,7 @@ | file://:0:0:0:0 | operator delete[] | isTopLevel() | 1 | 1 | | file://:0:0:0:0 | operator new[] | isTopLevel() | 1 | 1 | -| file://:0:0:0:0 | operator= | | 1 | 1 | -| file://:0:0:0:0 | operator= | | 1 | 1 | +| file://:0:0:0:0 | operator= | isTopLevel() | 1 | 1 | +| file://:0:0:0:0 | operator= | isTopLevel() | 1 | 1 | | scopes.cpp:2:7:2:7 | operator= | | 1 | 1 | | scopes.cpp:2:7:2:7 | operator= | | 1 | 1 | | scopes.cpp:7:7:7:7 | operator= | | 1 | 1 | diff --git a/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected b/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected index ae4c8d3fb3e1..44888d8f6a04 100644 --- a/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected +++ b/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected @@ -43,8 +43,8 @@ | cpp.cpp:87:5:87:26 | functionAccessesStatic | int | false | | cpp.cpp:93:6:93:14 | increment | int & -> void | false | | cpp.cpp:97:6:97:16 | doIncrement | void | false | -| file://:0:0:0:0 | operator= | __va_list_tag & | false | -| file://:0:0:0:0 | operator= | __va_list_tag & | false | +| file://:0:0:0:0 | operator= | __va_list_tag && -> __va_list_tag & | false | +| file://:0:0:0:0 | operator= | const __va_list_tag & -> __va_list_tag & | false | | sideEffects.c:4:5:4:6 | f1 | int | true | | sideEffects.c:12:5:12:6 | f2 | int | true | | sideEffects.c:20:5:20:6 | f3 | int | true | diff --git a/cpp/ql/test/library-tests/special_members/detect/detect.expected b/cpp/ql/test/library-tests/special_members/detect/detect.expected index 1d4f114a4990..ce012b6da1d9 100644 --- a/cpp/ql/test/library-tests/special_members/detect/detect.expected +++ b/cpp/ql/test/library-tests/special_members/detect/detect.expected @@ -28,4 +28,3 @@ | 6 none of the above | C::operator=(volatile C & c_templated) | | 6 none of the above | C::operator=(volatile C && c_templated) | | 6 none of the above | C::operator==(const C & c) | -| 6 none of the above | __va_list_tag::operator=() | diff --git a/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected b/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected index eb9e0d0529f7..23397167f046 100644 --- a/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected +++ b/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected @@ -54,7 +54,7 @@ | c1_gnu.c:7:8:7:12 | Lemon | 1 members | 1 locations | 0 | lemon_x | | c2_gnu.c:2:8:2:11 | Kiwi | 1 members | 1 locations | 0 | kiwi_x | | c2_gnu.c:7:8:7:12 | Lemon | 1 members | 1 locations | 0 | lemon_x | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 0 | gp_offset | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 1 | fp_offset | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 2 | overflow_arg_area | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 3 | reg_save_area | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 0 | gp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 1 | fp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 2 | overflow_arg_area | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 3 | reg_save_area | diff --git a/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected b/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected index 326fea4210f8..5691a04a073c 100644 --- a/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected +++ b/cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected @@ -1,57 +1,40 @@ -| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 0 | operator= | -| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 1 | operator= | +| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 2 | operator= | | a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 0 | x | -| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 1 | operator= | -| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 2 | operator= | +| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 3 | operator= | | a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 0 | empty | | a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 1 | nonempty | | a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 2 | i | -| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 3 | operator= | -| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 4 | operator= | -| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 0 | operator= | -| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 1 | operator= | +| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 5 | operator= | +| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 2 | operator= | | a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 0 | x | -| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 1 | operator= | -| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 2 | operator= | +| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 3 | operator= | | a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 0 | empty | | a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 1 | nonempty | | 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= | +| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 5 | 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:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 3 | 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:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 3 | 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:16:7:16:12 | Cherry | 3 members | 1 locations | 3 | 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:23:7:23:12 | Damson | 5 members | 2 locations | 4 | bar | +| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 4 | foo | +| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 4 | 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= | +| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 3 | 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:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 3 | 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:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 3 | 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:14:7:14:12 | Cherry | 3 members | 1 locations | 3 | 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= | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 0 | gp_offset | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 1 | fp_offset | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 2 | overflow_arg_area | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 3 | reg_save_area | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 4 | operator= | -| file://:0:0:0:0 | __va_list_tag | 6 members | 1 locations | 5 | operator= | +| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | bar | +| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | foo | +| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | operator= | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 0 | gp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 1 | fp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 2 | overflow_arg_area | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 3 | reg_save_area | diff --git a/cpp/ql/test/library-tests/structs/mutual_recursion/compatible_members.expected b/cpp/ql/test/library-tests/structs/mutual_recursion/compatible_members.expected index 92b8a908f755..da8965517905 100644 --- a/cpp/ql/test/library-tests/structs/mutual_recursion/compatible_members.expected +++ b/cpp/ql/test/library-tests/structs/mutual_recursion/compatible_members.expected @@ -24,7 +24,7 @@ | b.c:44:8:44:20 | IncompatibleD | 1 members | 2 locations | 0 | a | | b.c:51:8:51:20 | NonRecursiveA | 1 members | 1 locations | 0 | val | | b.c:55:8:55:20 | NonRecursiveB | 1 members | 1 locations | 0 | a | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 0 | gp_offset | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 1 | fp_offset | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 2 | overflow_arg_area | -| file://:0:0:0:0 | __va_list_tag | 4 members | 1 locations | 3 | reg_save_area | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 0 | gp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 1 | fp_offset | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 2 | overflow_arg_area | +| file://:0:0:0:0 | __va_list_tag | 4 members | 0 locations | 3 | reg_save_area | diff --git a/cpp/ql/test/library-tests/templates/CPP-203/decls.expected b/cpp/ql/test/library-tests/templates/CPP-203/decls.expected index c6f3122fe84f..1010a2891c67 100644 --- a/cpp/ql/test/library-tests/templates/CPP-203/decls.expected +++ b/cpp/ql/test/library-tests/templates/CPP-203/decls.expected @@ -7,6 +7,8 @@ | file://:0:0:0:0 | overflow_arg_area | | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | test.cpp:2:16:2:16 | T | | test.cpp:3:8:3:8 | operator= | diff --git a/cpp/ql/test/library-tests/templates/CPP-204/element.expected b/cpp/ql/test/library-tests/templates/CPP-204/element.expected index 6c07e74e41c7..7d9516508ae9 100644 --- a/cpp/ql/test/library-tests/templates/CPP-204/element.expected +++ b/cpp/ql/test/library-tests/templates/CPP-204/element.expected @@ -3,10 +3,12 @@ | file://:0:0:0:0 | (global namespace) | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | auto | | file://:0:0:0:0 | const EC | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | const bool | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -18,6 +20,8 @@ | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | file://:0:0:0:0 | void * | | test.cpp:0:0:0:0 | test.cpp | diff --git a/cpp/ql/test/library-tests/templates/CPP-223/decls.expected b/cpp/ql/test/library-tests/templates/CPP-223/decls.expected index c3ab0388d525..5709623a7910 100644 --- a/cpp/ql/test/library-tests/templates/CPP-223/decls.expected +++ b/cpp/ql/test/library-tests/templates/CPP-223/decls.expected @@ -6,6 +6,8 @@ | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | test.cpp:3:24:3:24 | b | | test.cpp:4:26:4:26 | c<> | @@ -13,6 +15,7 @@ | test.cpp:5:29:5:29 | e | | test.cpp:6:26:6:26 | p#0 | | test.cpp:6:29:6:31 | p#1 | +| test.cpp:7:20:7:20 | f | | test.cpp:7:20:7:26 | f | | test.cpp:7:28:7:28 | p#0 | | test.cpp:7:31:7:33 | p#1 | diff --git a/cpp/ql/test/library-tests/templates/decls/decls.expected b/cpp/ql/test/library-tests/templates/decls/decls.expected index 3789b785252b..43a691e53c9c 100644 --- a/cpp/ql/test/library-tests/templates/decls/decls.expected +++ b/cpp/ql/test/library-tests/templates/decls/decls.expected @@ -16,4 +16,6 @@ | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | overflow_arg_area | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | diff --git a/cpp/ql/test/library-tests/templates/destructors/destructors.expected b/cpp/ql/test/library-tests/templates/destructors/destructors.expected index d2a219e25b63..ad842c5e88e2 100644 --- a/cpp/ql/test/library-tests/templates/destructors/destructors.expected +++ b/cpp/ql/test/library-tests/templates/destructors/destructors.expected @@ -1,3 +1,3 @@ +| destructors.cpp:3:3:3:3 | ~Parameterized | destructors.cpp:2:8:2:20 | Parameterized | | destructors.cpp:3:3:3:16 | ~Parameterized | destructors.cpp:2:8:2:20 | Parameterized | -| destructors.cpp:3:3:3:16 | ~Parameterized | destructors.cpp:2:8:2:20 | Parameterized | | destructors.cpp:6:8:6:8 | ~Concrete | destructors.cpp:6:8:6:15 | Concrete | diff --git a/cpp/ql/test/library-tests/templates/extern/elements.expected b/cpp/ql/test/library-tests/templates/extern/elements.expected index 038f05ed3093..6e28f4cf28eb 100644 --- a/cpp/ql/test/library-tests/templates/extern/elements.expected +++ b/cpp/ql/test/library-tests/templates/extern/elements.expected @@ -3,8 +3,6 @@ | extern.cpp:1:20:1:20 | definition of T | | extern.cpp:2:5:2:5 | declaration of f | | extern.cpp:2:5:2:5 | f | -| extern.cpp:2:5:2:5 | f | | extern.cpp:2:7:2:7 | declaration of 1st parameter | | extern.cpp:2:7:2:7 | p#0 | -| extern.cpp:2:7:2:7 | p#0 | | extern.cpp:4:1:4:58 | // Currently we don't have an element for this declaration | diff --git a/cpp/ql/test/library-tests/templates/friends/decls.expected b/cpp/ql/test/library-tests/templates/friends/decls.expected index 7190a37e0574..2d73623d0d3c 100644 --- a/cpp/ql/test/library-tests/templates/friends/decls.expected +++ b/cpp/ql/test/library-tests/templates/friends/decls.expected @@ -1,7 +1,6 @@ | file://:0:0:0:0 | C's friend | | file://:0:0:0:0 | C's friend | | file://:0:0:0:0 | auto | -| file://:0:0:0:0 | f | | file://:0:0:0:0 | fp_offset | | file://:0:0:0:0 | gp_offset | | file://:0:0:0:0 | operator= | @@ -12,6 +11,7 @@ | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | reg_save_area | | friends.cpp:2:19:2:21 | TTT | | friends.cpp:4:19:4:21 | TTT | @@ -28,6 +28,8 @@ | friends.cpp:7:9:7:9 | operator= | | friends.cpp:7:9:7:9 | operator= | | friends.cpp:7:9:7:9 | operator= | +| friends.cpp:9:17:9:17 | f | | friends.cpp:9:17:9:19 | C's friend | +| friends.cpp:9:21:9:26 | p#0 | | friends.cpp:12:17:12:17 | f | | friends.cpp:13:17:13:17 | f | diff --git a/cpp/ql/test/library-tests/templates/functions/functions.expected b/cpp/ql/test/library-tests/templates/functions/functions.expected index 15c847d45d25..b43bdb235358 100644 --- a/cpp/ql/test/library-tests/templates/functions/functions.expected +++ b/cpp/ql/test/library-tests/templates/functions/functions.expected @@ -1,8 +1,8 @@ | template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:15 | operator T * | template_functions.cpp:6:28:6:32 | (T *)... | | template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:15 | operator T * | template_functions.cpp:6:32:6:32 | 1 | -| template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:15 | operator int * | template_functions.cpp:6:28:6:32 | (int *)... | -| template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:15 | operator int * | template_functions.cpp:6:32:6:32 | 1 | +| template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:5 | operator int * | template_functions.cpp:6:28:6:32 | (int *)... | +| template_functions.cpp:3:8:3:8 | X | template_functions.cpp:6:5:6:5 | operator int * | template_functions.cpp:6:32:6:32 | 1 | | template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:15 | operator Q * | template_functions.cpp:16:28:16:32 | (Q *)... | | template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:15 | operator Q * | template_functions.cpp:16:32:16:32 | 2 | -| template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:15 | operator int * | template_functions.cpp:16:28:16:32 | (int *)... | -| template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:15 | operator int * | template_functions.cpp:16:32:16:32 | 2 | +| template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:5 | operator int * | template_functions.cpp:16:28:16:32 | (int *)... | +| template_functions.cpp:13:10:13:14 | S | template_functions.cpp:16:5:16:5 | operator int * | template_functions.cpp:16:32:16:32 | 2 | diff --git a/cpp/ql/test/library-tests/templates/incomplete_instantiations/test.expected b/cpp/ql/test/library-tests/templates/incomplete_instantiations/test.expected index 4743633a2c4e..1cbf49e14d63 100644 --- a/cpp/ql/test/library-tests/templates/incomplete_instantiations/test.expected +++ b/cpp/ql/test/library-tests/templates/incomplete_instantiations/test.expected @@ -1,15 +1,13 @@ | h.h:3:7:3:7 | C | h.h:4:10:4:12 | fun | 0 | | h.h:3:7:3:7 | C | h.h:3:7:3:7 | operator= | 0 | | h.h:3:7:3:7 | C | h.h:3:7:3:7 | operator= | 0 | -| h.h:3:7:3:7 | C | h.h:4:10:4:12 | fun | 0 | | h.h:3:7:3:7 | C | h.h:3:7:3:7 | operator= | 0 | | h.h:3:7:3:7 | C | h.h:3:7:3:7 | operator= | 0 | -| h.h:3:7:3:7 | C | h.h:4:10:4:12 | fun | 0 | | h.h:8:7:8:7 | D | h.h:10:10:10:12 | fun | 2 | | h.h:8:7:8:7 | D | h.h:8:7:8:7 | operator= | 0 | | h.h:8:7:8:7 | D | h.h:8:7:8:7 | operator= | 0 | -| h.h:8:7:8:7 | D | h.h:10:10:10:12 | fun | 2 | +| h.h:8:7:8:7 | D | h.h:10:10:10:10 | fun | 2 | | h.h:14:7:14:7 | E | h.h:16:10:16:12 | fun | 2 | | h.h:14:7:14:7 | E | h.h:14:7:14:7 | operator= | 0 | | h.h:14:7:14:7 | E | h.h:14:7:14:7 | operator= | 0 | -| h.h:14:7:14:7 | E | h.h:16:10:16:12 | fun | 2 | +| h.h:14:7:14:7 | E | h.h:16:10:16:10 | fun | 2 | diff --git a/cpp/ql/test/library-tests/templates/instantiation_directive/functions.expected b/cpp/ql/test/library-tests/templates/instantiation_directive/functions.expected index efee8321dbd5..672fae72e062 100644 --- a/cpp/ql/test/library-tests/templates/instantiation_directive/functions.expected +++ b/cpp/ql/test/library-tests/templates/instantiation_directive/functions.expected @@ -1,3 +1,3 @@ -| test.cpp:2:6:2:8 | foo | file://:0:0:0:0 | float | -| test.cpp:2:6:2:8 | foo | file://:0:0:0:0 | int | +| file://:0:0:0:0 | operator= | file://:0:0:0:0 | __va_list_tag && | +| file://:0:0:0:0 | operator= | file://:0:0:0:0 | const __va_list_tag & | | test.cpp:2:6:2:8 | foo | test.cpp:1:19:1:19 | T | diff --git a/cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected b/cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected index a368e9100f0a..994e6edb7a06 100644 --- a/cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected +++ b/cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected @@ -35,6 +35,7 @@ | file://:0:0:0:0 | __uptr | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | abstract | | file://:0:0:0:0 | action * | | file://:0:0:0:0 | action *const | @@ -59,6 +60,8 @@ | file://:0:0:0:0 | composite && | | file://:0:0:0:0 | composite * | | file://:0:0:0:0 | const | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | const action>> | | file://:0:0:0:0 | const action>> & | | file://:0:0:0:0 | const actor1> | @@ -86,7 +89,6 @@ | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | declaration of 1st parameter | | file://:0:0:0:0 | decltype(nullptr) | -| file://:0:0:0:0 | definition of __va_list_tag | | file://:0:0:0:0 | definition of fp_offset | | file://:0:0:0:0 | definition of gp_offset | | file://:0:0:0:0 | definition of overflow_arg_area | @@ -141,6 +143,8 @@ | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | +| file://:0:0:0:0 | p#0 | | file://:0:0:0:0 | private | | file://:0:0:0:0 | protected | | file://:0:0:0:0 | public | @@ -198,19 +202,20 @@ | header.h:4:5:4:10 | actor1 | | header.h:4:5:4:10 | actor1 | | header.h:4:5:4:10 | declaration of actor1 | -| header.h:4:5:4:10 | declaration of actor1 | | header.h:6:24:6:24 | A | | header.h:6:24:6:24 | definition of A | +| header.h:8:5:8:5 | definition of funx | +| header.h:8:5:8:5 | funx | | header.h:8:5:8:8 | declaration of funx | | header.h:8:5:8:8 | definition of funx | | header.h:8:5:8:8 | funx | | header.h:8:5:8:8 | funx | -| header.h:8:5:8:8 | funx | | header.h:8:13:8:14 | a_ | | header.h:8:13:8:14 | a_ | | header.h:8:13:8:14 | a_ | | header.h:8:13:8:14 | declaration of a_ | | header.h:8:13:8:14 | definition of a_ | +| header.h:8:13:8:14 | definition of a_ | | header.h:8:17:11:5 | { ... } | | header.h:8:17:11:5 | { ... } | | header.h:9:9:9:14 | declaration | @@ -251,22 +256,25 @@ | test.cpp:7:8:7:16 | definition of composite | | test.cpp:8:24:8:29 | TupleT | | test.cpp:8:24:8:29 | definition of TupleT | +| test.cpp:9:10:9:10 | definition of eval | +| test.cpp:9:10:9:10 | eval | | test.cpp:9:10:9:13 | declaration of eval | | test.cpp:9:10:9:13 | definition of eval | | test.cpp:9:10:9:13 | eval | | test.cpp:9:10:9:13 | eval | -| test.cpp:9:10:9:13 | eval | | test.cpp:9:22:9:25 | args | | test.cpp:9:22:9:25 | args | | test.cpp:9:22:9:25 | args | | test.cpp:9:22:9:25 | declaration of args | | test.cpp:9:22:9:25 | definition of args | +| test.cpp:9:22:9:25 | definition of args | | test.cpp:9:28:9:30 | { ... } | | test.cpp:9:28:9:30 | { ... } | | test.cpp:9:30:9:30 | return ... | | test.cpp:9:30:9:30 | return ... | | test.cpp:12:1:12:19 | #include "header.h" | | test.cpp:14:20:14:26 | ActionT | +| test.cpp:14:20:14:26 | ActionT | | test.cpp:14:20:14:26 | definition of ActionT | | test.cpp:15:7:15:7 | Unknown literal | | test.cpp:15:7:15:7 | action | @@ -289,9 +297,10 @@ | test.cpp:15:7:15:12 | action | | test.cpp:15:7:15:12 | action>> | | test.cpp:15:7:15:12 | definition of action | +| test.cpp:17:10:17:10 | definition of eparse | +| test.cpp:17:10:17:10 | eparse | | test.cpp:17:10:17:15 | definition of eparse | | test.cpp:17:10:17:15 | eparse | -| test.cpp:17:10:17:15 | eparse | | test.cpp:17:19:20:5 | { ... } | | test.cpp:17:19:20:5 | { ... } | | test.cpp:18:9:18:17 | declaration | @@ -327,10 +336,13 @@ | test.cpp:26:7:26:10 | definition of rule | | test.cpp:26:7:26:10 | rule | | test.cpp:28:28:28:34 | ParserT | +| test.cpp:28:28:28:34 | ParserT | | test.cpp:28:28:28:34 | definition of ParserT | +| test.cpp:29:9:29:9 | definition of rule | +| test.cpp:29:9:29:9 | rule | | test.cpp:29:9:29:12 | definition of rule | | test.cpp:29:9:29:12 | rule | -| test.cpp:29:9:29:12 | rule | +| test.cpp:29:22:29:22 | definition of p | | test.cpp:29:22:29:22 | definition of p | | test.cpp:29:22:29:22 | p | | test.cpp:29:22:29:22 | p | diff --git a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/instantiations.expected b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/instantiations.expected index 778353664010..e1c7f956c7b6 100644 --- a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/instantiations.expected +++ b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/instantiations.expected @@ -1,13 +1,12 @@ -| isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | long | -| isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | short | -| isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | long | -| isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | short | -| isfromtemplateinstantiation.cpp:38:26:38:42 | a_template_method | FunctionTemplateInstantiation | file://:0:0:0:0 | short | +| isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | long | +| isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | short | +| isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | long | +| isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function | FunctionTemplateInstantiation | file://:0:0:0:0 | short | +| isfromtemplateinstantiation.cpp:38:26:38:26 | a_template_method | FunctionTemplateInstantiation | file://:0:0:0:0 | short | | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | ClassTemplateInstantiation | file://:0:0:0:0 | char | -| isfromtemplateinstantiation.cpp:53:26:53:42 | b_template_method | FunctionTemplateInstantiation | file://:0:0:0:0 | long | +| isfromtemplateinstantiation.cpp:53:26:53:26 | b_template_method | FunctionTemplateInstantiation | file://:0:0:0:0 | long | | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | ClassTemplateInstantiation | file://:0:0:0:0 | int | | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | ClassTemplateInstantiation | file://:0:0:0:0 | long * | | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | ClassTemplateInstantiation | file://:0:0:0:0 | int | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | ClassTemplateInstantiation | file://:0:0:0:0 | long | | load.cpp:13:7:13:27 | basic_text_iprimitive | ClassTemplateInstantiation | load.cpp:3:7:3:24 | std_istream_mockup | -| load.cpp:22:10:22:13 | load | FunctionTemplateInstantiation | file://:0:0:0:0 | short | diff --git a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected index dc73e749a4cd..a97246dd8991 100644 --- a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected +++ b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.expected @@ -1,67 +1,78 @@ -| isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:2:14:5 | declaration | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:2:14:5 | declaration | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:4:14:4 | definition of t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:4:14:4 | definition of t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:4:14:4 | t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:14:4:14:4 | t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:2 | t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:2 | t | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:4 | ... ++ | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:4 | ... ++ | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:5 | ExprStmt | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:16:2:16:5 | ExprStmt | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function() | -| isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:2:21:11 | declaration | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:2:21:11 | declaration | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:6:21:6 | definition of i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:6:21:6 | definition of i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:6:21:6 | i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:6:21:6 | i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:9:21:10 | 0 | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:9:21:10 | 0 | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:9:21:10 | initializer for i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:21:9:21:10 | initializer for i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:8 | i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:8 | i | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:9 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:23:2:23:9 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:25:2:25:27 | call to inner_template_function | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:25:2:25:27 | call to inner_template_function | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:25:2:25:30 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:25:2:25:30 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:26:1:26:1 | return ... | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:26:1:26:1 | return ... | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function() | -| isfromtemplateinstantiation.cpp:39:2:40:2 | { ... } | isfromtemplateinstantiation.cpp:38:26:38:42 | normal_class::a_template_method() | -| isfromtemplateinstantiation.cpp:40:2:40:2 | return ... | isfromtemplateinstantiation.cpp:38:26:38:42 | normal_class::a_template_method() | +| isfromtemplateinstantiation.cpp:12:24:12:24 | definition of inner_template_function | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:12:24:12:24 | definition of inner_template_function | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:2:14:5 | declaration | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:2:14:5 | declaration | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:4:14:4 | definition of t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:4:14:4 | definition of t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:4:14:4 | t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:14:4:14:4 | t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:2 | t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:2 | t | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:4 | ... ++ | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:4 | ... ++ | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:5 | ExprStmt | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:16:2:16:5 | ExprStmt | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function() | +| isfromtemplateinstantiation.cpp:19:24:19:24 | definition of outer_template_function | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:19:24:19:24 | definition of outer_template_function | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:2:21:11 | declaration | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:2:21:11 | declaration | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:6:21:6 | definition of i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:6:21:6 | definition of i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:6:21:6 | i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:6:21:6 | i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:9:21:10 | 0 | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:9:21:10 | 0 | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:9:21:10 | initializer for i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:21:9:21:10 | initializer for i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:8 | i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:8 | i | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:9 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:23:2:23:9 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:25:2:25:27 | call to inner_template_function | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:25:2:25:27 | call to inner_template_function | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:25:2:25:30 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:25:2:25:30 | ExprStmt | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:26:1:26:1 | return ... | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:26:1:26:1 | return ... | isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function() | +| isfromtemplateinstantiation.cpp:38:26:38:26 | definition of a_template_method | isfromtemplateinstantiation.cpp:38:26:38:26 | normal_class::a_template_method() | +| isfromtemplateinstantiation.cpp:39:2:40:2 | { ... } | isfromtemplateinstantiation.cpp:38:26:38:26 | normal_class::a_template_method() | +| isfromtemplateinstantiation.cpp:40:2:40:2 | return ... | isfromtemplateinstantiation.cpp:38:26:38:26 | normal_class::a_template_method() | | isfromtemplateinstantiation.cpp:44:26:44:26 | declaration of operator= | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:44:26:44:26 | declaration of operator= | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:44:26:44:26 | template_class::operator=(const template_class &) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:44:26:44:26 | template_class::operator=(template_class &&) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:46:4:46:4 | definition of t | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:46:4:46:4 | t | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:49:7:49:14 | template_class::b_method() | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | +| isfromtemplateinstantiation.cpp:49:7:49:7 | definition of b_method | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | +| isfromtemplateinstantiation.cpp:49:7:49:7 | definition of b_method | isfromtemplateinstantiation.cpp:49:7:49:7 | template_class::b_method() | +| isfromtemplateinstantiation.cpp:49:7:49:7 | template_class::b_method() | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:50:2:51:2 | { ... } | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:50:2:51:2 | { ... } | isfromtemplateinstantiation.cpp:49:7:49:14 | template_class::b_method() | +| isfromtemplateinstantiation.cpp:50:2:51:2 | { ... } | isfromtemplateinstantiation.cpp:49:7:49:7 | template_class::b_method() | | isfromtemplateinstantiation.cpp:51:2:51:2 | return ... | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:51:2:51:2 | return ... | isfromtemplateinstantiation.cpp:49:7:49:14 | template_class::b_method() | +| isfromtemplateinstantiation.cpp:51:2:51:2 | return ... | isfromtemplateinstantiation.cpp:49:7:49:7 | template_class::b_method() | +| isfromtemplateinstantiation.cpp:53:26:53:26 | definition of b_template_method | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | +| isfromtemplateinstantiation.cpp:53:26:53:26 | definition of b_template_method | isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | +| isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:53:26:53:42 | declaration of b_template_method | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:53:26:53:42 | template_class::b_template_method(U) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:53:26:53:42 | template_class::b_template_method(long) | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:53:46:53:46 | U u | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | | isfromtemplateinstantiation.cpp:53:46:53:46 | declaration of u | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | +| isfromtemplateinstantiation.cpp:53:46:53:46 | definition of u | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | +| isfromtemplateinstantiation.cpp:53:46:53:46 | definition of u | isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | | isfromtemplateinstantiation.cpp:53:46:53:46 | long u | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:53:46:53:46 | long u | isfromtemplateinstantiation.cpp:53:26:53:42 | template_class::b_template_method(long) | +| isfromtemplateinstantiation.cpp:53:46:53:46 | long u | isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | | isfromtemplateinstantiation.cpp:54:2:55:2 | { ... } | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:54:2:55:2 | { ... } | isfromtemplateinstantiation.cpp:53:26:53:42 | template_class::b_template_method(long) | +| isfromtemplateinstantiation.cpp:54:2:55:2 | { ... } | isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | | isfromtemplateinstantiation.cpp:55:2:55:2 | return ... | isfromtemplateinstantiation.cpp:44:26:44:39 | template_class | -| isfromtemplateinstantiation.cpp:55:2:55:2 | return ... | isfromtemplateinstantiation.cpp:53:26:53:42 | template_class::b_template_method(long) | +| isfromtemplateinstantiation.cpp:55:2:55:2 | return ... | isfromtemplateinstantiation.cpp:53:26:53:26 | template_class::b_template_method(long) | | isfromtemplateinstantiation.cpp:77:26:77:26 | AnotherTemplateClass::operator=(AnotherTemplateClass &&) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:77:26:77:26 | AnotherTemplateClass::operator=(const AnotherTemplateClass &) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:77:26:77:26 | AnotherTemplateClass::operator=(AnotherTemplateClass &&) | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | @@ -86,32 +97,33 @@ | isfromtemplateinstantiation.cpp:86:16:86:16 | definition of l | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:86:16:86:16 | l | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:90:3:90:18 | MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:93:7:93:15 | AnotherTemplateClass::myMethod1(MyClassEnum) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:93:7:93:7 | definition of myMethod1 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:93:7:93:7 | definition of myMethod1 | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | | isfromtemplateinstantiation.cpp:93:29:93:32 | MyClassEnum mce1 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:93:29:93:32 | MyClassEnum mce1 | isfromtemplateinstantiation.cpp:93:7:93:15 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:93:29:93:32 | MyClassEnum mce1 | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:93:29:93:32 | definition of mce1 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:93:29:93:32 | definition of mce1 | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | | isfromtemplateinstantiation.cpp:93:36:93:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:93:36:93:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:93:7:93:15 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:93:36:93:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | | isfromtemplateinstantiation.cpp:93:54:93:55 | { ... } | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:93:54:93:55 | { ... } | isfromtemplateinstantiation.cpp:93:7:93:15 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:93:54:93:55 | { ... } | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | | isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | isfromtemplateinstantiation.cpp:93:7:93:15 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | isfromtemplateinstantiation.cpp:93:7:93:7 | AnotherTemplateClass::myMethod1(MyClassEnum) | +| isfromtemplateinstantiation.cpp:94:29:94:32 | definition of mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:94:29:94:32 | definition of mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | | isfromtemplateinstantiation.cpp:94:36:94:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:94:36:94:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:97:25:97:60 | AnotherTemplateClass::myMethod2(MyClassEnum) | -| isfromtemplateinstantiation.cpp:97:25:97:60 | AnotherTemplateClass::myMethod2(MyClassEnum) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:94:36:94:51 | MyClassEnumConst | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | +| isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | | isfromtemplateinstantiation.cpp:97:74:97:77 | MyClassEnum mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:97:74:97:77 | MyClassEnum mce2 | isfromtemplateinstantiation.cpp:97:25:97:60 | AnotherTemplateClass::myMethod2(MyClassEnum) | +| isfromtemplateinstantiation.cpp:97:74:97:77 | MyClassEnum mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | | isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:97:25:97:60 | AnotherTemplateClass::myMethod2(MyClassEnum) | +| isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | | isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:97:25:97:60 | AnotherTemplateClass::myMethod2(MyClassEnum) | +| isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:97:52:97:52 | AnotherTemplateClass::myMethod2(MyClassEnum) | | isfromtemplateinstantiation.cpp:110:3:110:3 | definition of var_template | isfromtemplateinstantiation.cpp:110:3:110:3 | var_template | -| isfromtemplateinstantiation.cpp:129:6:129:6 | AnotherTemplateClass::f() | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:129:10:129:22 | { ... } | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:129:10:129:22 | { ... } | isfromtemplateinstantiation.cpp:129:6:129:6 | AnotherTemplateClass::f() | -| isfromtemplateinstantiation.cpp:129:12:129:20 | return ... | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:129:12:129:20 | return ... | isfromtemplateinstantiation.cpp:129:6:129:6 | AnotherTemplateClass::f() | -| isfromtemplateinstantiation.cpp:129:19:129:19 | 1 | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | -| isfromtemplateinstantiation.cpp:129:19:129:19 | 1 | isfromtemplateinstantiation.cpp:129:6:129:6 | AnotherTemplateClass::f() | | isfromtemplateinstantiation.cpp:134:29:134:29 | Outer::operator=(Outer &&) | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:134:29:134:29 | Outer::operator=(const Outer &) | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:134:29:134:29 | declaration of operator= | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | @@ -120,6 +132,8 @@ | isfromtemplateinstantiation.cpp:135:31:135:31 | Outer::Inner::operator=(const Inner &) | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:135:31:135:31 | declaration of operator= | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:135:31:135:31 | declaration of operator= | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | +| isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | +| isfromtemplateinstantiation.cpp:135:31:135:35 | declaration of Inner | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:136:7:136:7 | definition of x | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:136:7:136:7 | x | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:137:7:137:7 | definition of y | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | @@ -132,78 +146,7 @@ | load.cpp:13:7:13:7 | definition of operator= | load.cpp:13:7:13:27 | basic_text_iprimitive | | load.cpp:15:14:15:15 | definition of is | load.cpp:13:7:13:27 | basic_text_iprimitive | | load.cpp:15:14:15:15 | is | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:18:36:18:42 | std_istream_mockup & isParam | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:18:36:18:42 | std_istream_mockup & isParam | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:11:19:21 | constructor init of field is | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:11:19:21 | constructor init of field is | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:14:19:20 | (reference dereference) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:14:19:20 | (reference dereference) | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:14:19:20 | (reference to) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:14:19:20 | (reference to) | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:14:19:20 | isParam | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:14:19:20 | isParam | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:23:19:24 | { ... } | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:23:19:24 | { ... } | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | -| load.cpp:19:24:19:24 | return ... | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:19:24:19:24 | return ... | load.cpp:18:5:18:25 | basic_text_iprimitive::basic_text_iprimitive(std_istream_mockup &) | | load.cpp:22:10:22:13 | basic_text_iprimitive::load(T &) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | load.cpp:13:7:13:27 | basic_text_iprimitive | | load.cpp:22:10:22:13 | declaration of load | load.cpp:13:7:13:27 | basic_text_iprimitive | | load.cpp:22:19:22:19 | T & t | load.cpp:13:7:13:27 | basic_text_iprimitive | | load.cpp:22:19:22:19 | declaration of t | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:22:19:22:19 | short & t | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:22:19:22:19 | short & t | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:23:5:25:5 | { ... } | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:23:5:25:5 | { ... } | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:9:24:10 | (reference dereference) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:9:24:10 | (reference dereference) | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:9:24:10 | is | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:9:24:10 | is | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:9:24:16 | ExprStmt | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:9:24:16 | ExprStmt | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:12:24:12 | call to operator>> | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:12:24:12 | call to operator>> | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:12:24:16 | (reference dereference) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:12:24:16 | (reference dereference) | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:15:24:15 | (reference dereference) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:15:24:15 | (reference dereference) | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:15:24:15 | (reference to) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:15:24:15 | (reference to) | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:24:15:24:15 | t | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:24:15:24:15 | t | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:25:5:25:5 | return ... | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:25:5:25:5 | return ... | load.cpp:22:10:22:13 | basic_text_iprimitive::load(short &) | -| load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:27:22:27:22 | char & t | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:27:22:27:22 | char & t | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:28:5:32:5 | { ... } | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:28:5:32:5 | { ... } | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:29:9:29:20 | declaration | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:29:9:29:20 | declaration | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:29:19:29:19 | definition of i | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:29:19:29:19 | definition of i | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:29:19:29:19 | i | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:29:19:29:19 | i | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:30:9:30:12 | call to load | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:30:9:30:12 | call to load | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:30:9:30:16 | ExprStmt | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:30:9:30:16 | ExprStmt | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:30:14:30:14 | (reference to) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:30:14:30:14 | (reference to) | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:30:14:30:14 | i | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:30:14:30:14 | i | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:9:31:9 | (reference dereference) | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:9:31:9 | (reference dereference) | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:9:31:9 | t | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:9:31:9 | t | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:9:31:13 | ... = ... | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:9:31:13 | ... = ... | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:9:31:14 | ExprStmt | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:9:31:14 | ExprStmt | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:13:31:13 | (char)... | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:13:31:13 | (char)... | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:31:13:31:13 | i | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:31:13:31:13 | i | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | -| load.cpp:32:5:32:5 | return ... | load.cpp:13:7:13:27 | basic_text_iprimitive | -| load.cpp:32:5:32:5 | return ... | load.cpp:27:10:27:13 | basic_text_iprimitive::load(char &) | diff --git a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected index 74a096dff1aa..b5b562f95eb5 100644 --- a/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected +++ b/cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected @@ -1,13 +1,9 @@ isFromUninstantiatedTemplate | file://:0:0:0:0 | 0 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| file://:0:0:0:0 | 0 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| file://:0:0:0:0 | (int)... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | file://:0:0:0:0 | (int)... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| file://:0:0:0:0 | Inner | file://:0:0:0:0 | Inner | | file://:0:0:0:0 | declaration of 1st parameter | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | file://:0:0:0:0 | declaration of 1st parameter | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | file://:0:0:0:0 | initializer for MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | -| file://:0:0:0:0 | initializer for MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | file://:0:0:0:0 | p#0 | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | file://:0:0:0:0 | p#0 | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | file://:0:0:0:0 | this | load.cpp:13:7:13:27 | basic_text_iprimitive | @@ -100,20 +96,37 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | isfromtemplateinstantiation.cpp:93:7:93:15 | myMethod1 | | isfromtemplateinstantiation.cpp:94:7:94:15 | declaration of myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:94:7:94:15 | declaration of myMethod2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:94:7:94:15 | declaration of myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:94:29:94:32 | declaration of mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:94:29:94:32 | declaration of mce2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:94:29:94:32 | declaration of mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:97:25:97:60 | definition of myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:97:25:97:60 | definition of myMethod2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:25:97:60 | definition of myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | | isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:97:74:97:77 | mce2 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:97:74:97:77 | mce2 | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:97:74:97:77 | mce2 | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass | | isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | +| isfromtemplateinstantiation.cpp:99:1:99:1 | return ... | isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | isfromtemplateinstantiation.cpp:110:15:110:15 | definition of var_template | isfromtemplateinstantiation.cpp:110:15:110:15 | var_template | | isfromtemplateinstantiation.cpp:110:15:110:15 | var_template | isfromtemplateinstantiation.cpp:110:15:110:15 | var_template | | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | @@ -136,7 +149,9 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:135:31:135:31 | operator= | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | +| isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | +| isfromtemplateinstantiation.cpp:135:31:135:35 | declaration of Inner | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:135:31:135:35 | definition of Inner | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | | isfromtemplateinstantiation.cpp:135:31:135:35 | definition of Inner | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | isfromtemplateinstantiation.cpp:136:7:136:7 | definition of x | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer | @@ -257,9 +272,11 @@ isFromUninstantiatedTemplate | load.cpp:32:5:32:5 | return ... | load.cpp:27:10:27:13 | load | #select | isfromtemplateinstantiation.cpp:4:6:4:20 | normal_function | | | Declaration | | +| isfromtemplateinstantiation.cpp:12:24:12:24 | definition of inner_template_function | I | | Definition | | +| isfromtemplateinstantiation.cpp:12:24:12:24 | definition of inner_template_function | I | | Definition | | +| isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function | I | | Declaration | | +| isfromtemplateinstantiation.cpp:12:24:12:24 | inner_template_function | I | | Declaration | | | isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function | | T | Declaration | | -| isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function | I | | Declaration | | -| isfromtemplateinstantiation.cpp:12:24:12:46 | inner_template_function | I | | Declaration | | | isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | | T | Stmt | | | isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | I | | Stmt | | | isfromtemplateinstantiation.cpp:13:1:17:1 | { ... } | I | | Stmt | | @@ -284,9 +301,11 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | | T | Stmt | | | isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | I | | Stmt | | | isfromtemplateinstantiation.cpp:17:1:17:1 | return ... | I | | Stmt | | +| isfromtemplateinstantiation.cpp:19:24:19:24 | definition of outer_template_function | I | | Definition | | +| isfromtemplateinstantiation.cpp:19:24:19:24 | definition of outer_template_function | I | | Definition | | +| isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function | I | | Declaration | | +| isfromtemplateinstantiation.cpp:19:24:19:24 | outer_template_function | I | | Declaration | | | isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function | | T | Declaration | | -| isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function | I | | Declaration | | -| isfromtemplateinstantiation.cpp:19:24:19:46 | outer_template_function | I | | Declaration | | | isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | | T | Stmt | | | isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | I | | Stmt | | | isfromtemplateinstantiation.cpp:20:1:26:1 | { ... } | I | | Stmt | | @@ -308,6 +327,9 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | | T | Expr | | | isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | I | | Expr | | | isfromtemplateinstantiation.cpp:23:2:23:8 | ... ++ | I | | Expr | | +| isfromtemplateinstantiation.cpp:23:2:23:8 | A_MACRO | | | other | | +| isfromtemplateinstantiation.cpp:23:2:23:8 | A_MACRO | | | other | | +| isfromtemplateinstantiation.cpp:23:2:23:8 | A_MACRO | | | other | | | isfromtemplateinstantiation.cpp:23:2:23:8 | i | | T | Expr | Not ref | | isfromtemplateinstantiation.cpp:23:2:23:8 | i | I | | Expr | Not ref | | isfromtemplateinstantiation.cpp:23:2:23:8 | i | I | | Expr | Not ref | @@ -329,8 +351,8 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:29:7:29:7 | operator= | | | Declaration | | | isfromtemplateinstantiation.cpp:29:7:29:18 | normal_class | | | Declaration | | | isfromtemplateinstantiation.cpp:34:7:34:14 | a_method | | | Declaration | | +| isfromtemplateinstantiation.cpp:38:26:38:26 | a_template_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:38:26:38:42 | a_template_method | | T | Declaration | | -| isfromtemplateinstantiation.cpp:38:26:38:42 | a_template_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:39:2:40:2 | { ... } | | T | Stmt | | | isfromtemplateinstantiation.cpp:39:2:40:2 | { ... } | I | | Stmt | | | isfromtemplateinstantiation.cpp:40:2:40:2 | return ... | | T | Stmt | | @@ -345,15 +367,17 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:46:4:46:4 | definition of t | I | | Definition | | | isfromtemplateinstantiation.cpp:46:4:46:4 | t | | T | Declaration | | | isfromtemplateinstantiation.cpp:46:4:46:4 | t | I | | Declaration | | +| isfromtemplateinstantiation.cpp:49:7:49:7 | b_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:49:7:49:14 | b_method | | T | Declaration | | -| isfromtemplateinstantiation.cpp:49:7:49:14 | b_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:50:2:51:2 | { ... } | | T | Stmt | | | isfromtemplateinstantiation.cpp:50:2:51:2 | { ... } | I | | Stmt | | | isfromtemplateinstantiation.cpp:51:2:51:2 | return ... | | T | Stmt | | | isfromtemplateinstantiation.cpp:51:2:51:2 | return ... | I | | Stmt | | +| isfromtemplateinstantiation.cpp:53:26:53:26 | b_template_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:53:26:53:42 | b_template_method | | T | Declaration | | -| isfromtemplateinstantiation.cpp:53:26:53:42 | b_template_method | I | | Declaration | | | isfromtemplateinstantiation.cpp:53:26:53:42 | b_template_method | I | T | Declaration | | +| isfromtemplateinstantiation.cpp:53:46:53:46 | definition of u | | T | Definition | | +| isfromtemplateinstantiation.cpp:53:46:53:46 | definition of u | I | | Definition | | | isfromtemplateinstantiation.cpp:53:46:53:46 | u | | T | Declaration | | | isfromtemplateinstantiation.cpp:53:46:53:46 | u | I | | Declaration | | | isfromtemplateinstantiation.cpp:53:46:53:46 | u | I | T | Declaration | | @@ -390,8 +414,10 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:86:16:86:16 | l | I | | Declaration | | | isfromtemplateinstantiation.cpp:90:3:90:18 | MyClassEnumConst | | T | Declaration | | | isfromtemplateinstantiation.cpp:90:3:90:18 | MyClassEnumConst | I | | Declaration | | +| isfromtemplateinstantiation.cpp:93:7:93:7 | myMethod1 | I | | Declaration | | | isfromtemplateinstantiation.cpp:93:7:93:15 | myMethod1 | | T | Declaration | | -| isfromtemplateinstantiation.cpp:93:7:93:15 | myMethod1 | I | | Declaration | | +| isfromtemplateinstantiation.cpp:93:29:93:32 | definition of mce1 | | T | Definition | | +| isfromtemplateinstantiation.cpp:93:29:93:32 | definition of mce1 | I | | Definition | | | isfromtemplateinstantiation.cpp:93:29:93:32 | mce1 | | T | Declaration | | | isfromtemplateinstantiation.cpp:93:29:93:32 | mce1 | I | | Declaration | | | isfromtemplateinstantiation.cpp:93:54:93:55 | { ... } | | T | Stmt | | @@ -399,7 +425,12 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | | T | Stmt | | | isfromtemplateinstantiation.cpp:93:55:93:55 | return ... | I | | Stmt | | | isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | | T | Declaration | | -| isfromtemplateinstantiation.cpp:97:25:97:60 | myMethod2 | I | | Declaration | | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | | T | Definition | | +| isfromtemplateinstantiation.cpp:97:52:97:52 | definition of myMethod2 | I | | Definition | | +| isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | | T | Declaration | | +| isfromtemplateinstantiation.cpp:97:52:97:52 | myMethod2 | I | | Declaration | | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | | T | Definition | | +| isfromtemplateinstantiation.cpp:97:74:97:77 | definition of mce2 | | T | Definition | | | isfromtemplateinstantiation.cpp:97:74:97:77 | mce2 | | T | Declaration | | | isfromtemplateinstantiation.cpp:97:74:97:77 | mce2 | I | | Declaration | | | isfromtemplateinstantiation.cpp:98:1:99:1 | { ... } | | T | Stmt | | @@ -417,13 +448,6 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | | T | Declaration | | | isfromtemplateinstantiation.cpp:128:7:128:30 | AnotherTemplateClass | I | | Declaration | | | isfromtemplateinstantiation.cpp:129:6:129:6 | f | | T | Declaration | | -| isfromtemplateinstantiation.cpp:129:6:129:6 | f | I | | Declaration | | -| isfromtemplateinstantiation.cpp:129:10:129:22 | { ... } | | T | Stmt | | -| isfromtemplateinstantiation.cpp:129:10:129:22 | { ... } | I | | Stmt | | -| isfromtemplateinstantiation.cpp:129:12:129:20 | return ... | | T | Stmt | | -| isfromtemplateinstantiation.cpp:129:12:129:20 | return ... | I | | Stmt | | -| isfromtemplateinstantiation.cpp:129:19:129:19 | 1 | | T | Expr | | -| isfromtemplateinstantiation.cpp:129:19:129:19 | 1 | I | | Expr | | | isfromtemplateinstantiation.cpp:134:29:134:29 | declaration of operator= | I | | DeclarationEntry | | | isfromtemplateinstantiation.cpp:134:29:134:29 | declaration of operator= | I | | DeclarationEntry | | | isfromtemplateinstantiation.cpp:134:29:134:29 | operator= | I | | Declaration | | @@ -435,6 +459,7 @@ isFromUninstantiatedTemplate | isfromtemplateinstantiation.cpp:135:31:135:31 | operator= | I | T | Declaration | | | isfromtemplateinstantiation.cpp:135:31:135:31 | operator= | I | T | Declaration | | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | | T | Declaration | | +| isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | I | T | Declaration | | | isfromtemplateinstantiation.cpp:135:31:135:35 | Inner | I | T | Declaration | | | isfromtemplateinstantiation.cpp:136:7:136:7 | definition of x | | T | Definition | | | isfromtemplateinstantiation.cpp:136:7:136:7 | definition of x | I | T | Definition | | @@ -472,72 +497,19 @@ isFromUninstantiatedTemplate | load.cpp:15:14:15:15 | is | | T | Declaration | | | load.cpp:15:14:15:15 | is | I | | Declaration | | | load.cpp:18:5:18:25 | basic_text_iprimitive | | T | Declaration | | -| load.cpp:18:5:18:25 | basic_text_iprimitive | I | | Declaration | | -| load.cpp:18:36:18:42 | isParam | | T | Declaration | | -| load.cpp:18:36:18:42 | isParam | I | | Declaration | | -| load.cpp:19:11:19:21 | constructor init of field is | | T | Expr | | -| load.cpp:19:11:19:21 | constructor init of field is | I | | Expr | | | load.cpp:19:14:19:20 | (reference dereference) | | T | Expr | | -| load.cpp:19:14:19:20 | (reference dereference) | I | | Expr | | | load.cpp:19:14:19:20 | (reference to) | | T | Expr | | -| load.cpp:19:14:19:20 | (reference to) | I | | Expr | | | load.cpp:19:14:19:20 | isParam | | T | Expr | Ref | -| load.cpp:19:14:19:20 | isParam | I | | Expr | Ref | -| load.cpp:19:23:19:24 | { ... } | | T | Stmt | | -| load.cpp:19:23:19:24 | { ... } | I | | Stmt | | -| load.cpp:19:24:19:24 | return ... | | T | Stmt | | -| load.cpp:19:24:19:24 | return ... | I | | Stmt | | | load.cpp:22:10:22:13 | load | | T | Declaration | | -| load.cpp:22:10:22:13 | load | I | | Declaration | | | load.cpp:22:10:22:13 | load | I | T | Declaration | | | load.cpp:22:19:22:19 | t | | T | Declaration | | -| load.cpp:22:19:22:19 | t | I | | Declaration | | | load.cpp:22:19:22:19 | t | I | T | Declaration | | -| load.cpp:23:5:25:5 | { ... } | | T | Stmt | | -| load.cpp:23:5:25:5 | { ... } | I | | Stmt | | | load.cpp:24:9:24:10 | (reference dereference) | | T | Expr | | -| load.cpp:24:9:24:10 | (reference dereference) | I | | Expr | | | load.cpp:24:9:24:10 | is | | T | Expr | Not ref | -| load.cpp:24:9:24:10 | is | I | | Expr | Not ref | -| load.cpp:24:9:24:16 | ExprStmt | | T | Stmt | | -| load.cpp:24:9:24:16 | ExprStmt | I | | Stmt | | | load.cpp:24:15:24:15 | (reference dereference) | | T | Expr | | -| load.cpp:24:15:24:15 | (reference dereference) | I | | Expr | | -| load.cpp:24:15:24:15 | (reference to) | I | | Expr | | | load.cpp:24:15:24:15 | t | | T | Expr | Not ref | -| load.cpp:24:15:24:15 | t | I | | Expr | Ref | -| load.cpp:25:5:25:5 | return ... | | T | Stmt | | -| load.cpp:25:5:25:5 | return ... | I | | Stmt | | | load.cpp:27:10:27:13 | load | | T | Declaration | | -| load.cpp:27:10:27:13 | load | I | | Declaration | | -| load.cpp:27:22:27:22 | t | | T | Declaration | | -| load.cpp:27:22:27:22 | t | I | | Declaration | | -| load.cpp:28:5:32:5 | { ... } | | T | Stmt | | -| load.cpp:28:5:32:5 | { ... } | I | | Stmt | | -| load.cpp:29:9:29:20 | declaration | | T | Stmt | | -| load.cpp:29:9:29:20 | declaration | I | | Stmt | | -| load.cpp:29:19:29:19 | definition of i | | T | Definition | | -| load.cpp:29:19:29:19 | definition of i | I | | Definition | | -| load.cpp:29:19:29:19 | i | | T | Declaration | | -| load.cpp:29:19:29:19 | i | I | | Declaration | | -| load.cpp:30:9:30:12 | Unknown literal | | T | Expr | | -| load.cpp:30:9:30:12 | call to load | I | | Expr | | -| load.cpp:30:9:30:16 | ExprStmt | | T | Stmt | | -| load.cpp:30:9:30:16 | ExprStmt | I | | Stmt | | -| load.cpp:30:14:30:14 | (reference to) | I | | Expr | | -| load.cpp:30:14:30:14 | i | | T | Expr | Not ref | -| load.cpp:30:14:30:14 | i | I | | Expr | Ref | | load.cpp:31:9:31:9 | (reference dereference) | | T | Expr | | -| load.cpp:31:9:31:9 | (reference dereference) | I | | Expr | | | load.cpp:31:9:31:9 | t | | T | Expr | Not ref | -| load.cpp:31:9:31:9 | t | I | | Expr | Not ref | -| load.cpp:31:9:31:13 | ... = ... | | T | Expr | | -| load.cpp:31:9:31:13 | ... = ... | I | | Expr | | -| load.cpp:31:9:31:14 | ExprStmt | | T | Stmt | | -| load.cpp:31:9:31:14 | ExprStmt | I | | Stmt | | | load.cpp:31:13:31:13 | (char)... | | T | Expr | | -| load.cpp:31:13:31:13 | (char)... | I | | Expr | | | load.cpp:31:13:31:13 | i | | T | Expr | Not ref | -| load.cpp:31:13:31:13 | i | I | | Expr | Not ref | -| load.cpp:32:5:32:5 | return ... | | T | Stmt | | -| load.cpp:32:5:32:5 | return ... | I | | Stmt | | diff --git a/cpp/ql/test/library-tests/templates/switch/test.expected b/cpp/ql/test/library-tests/templates/switch/test.expected index b4124494ffeb..1ba49e1caf9d 100644 --- a/cpp/ql/test/library-tests/templates/switch/test.expected +++ b/cpp/ql/test/library-tests/templates/switch/test.expected @@ -1,2 +1 @@ | test.cpp:13:3:20:3 | switch (...) ... | 3 | -| test.cpp:13:3:20:3 | switch (...) ... | 3 | diff --git a/cpp/ql/test/library-tests/templates/type_instantiations/types.expected b/cpp/ql/test/library-tests/templates/type_instantiations/types.expected index 31d7b7caa944..94930e59b7fa 100644 --- a/cpp/ql/test/library-tests/templates/type_instantiations/types.expected +++ b/cpp/ql/test/library-tests/templates/type_instantiations/types.expected @@ -19,11 +19,14 @@ | file://:0:0:0:0 | __int128 | | file://:0:0:0:0 | __va_list_tag | | file://:0:0:0:0 | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | | file://:0:0:0:0 | auto | | file://:0:0:0:0 | bool | | file://:0:0:0:0 | char | | file://:0:0:0:0 | char16_t | | file://:0:0:0:0 | char32_t | +| file://:0:0:0:0 | const __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | | file://:0:0:0:0 | decltype(nullptr) | | file://:0:0:0:0 | double | | file://:0:0:0:0 | error | diff --git a/cpp/ql/test/library-tests/type_sizes/type_sizes.expected b/cpp/ql/test/library-tests/type_sizes/type_sizes.expected index 02d91f1b7011..287a713f2f09 100644 --- a/cpp/ql/test/library-tests/type_sizes/type_sizes.expected +++ b/cpp/ql/test/library-tests/type_sizes/type_sizes.expected @@ -40,6 +40,7 @@ | file://:0:0:0:0 | __int128 | 16 | | file://:0:0:0:0 | __va_list_tag | 24 | | file://:0:0:0:0 | __va_list_tag & | 8 | +| file://:0:0:0:0 | __va_list_tag && | 8 | | file://:0:0:0:0 | auto | | | file://:0:0:0:0 | bool | 1 | | file://:0:0:0:0 | char | 1 | @@ -54,6 +55,8 @@ | file://:0:0:0:0 | const StructWithDef & | 8 | | file://:0:0:0:0 | const UnionWithDef | 4 | | file://:0:0:0:0 | const UnionWithDef & | 8 | +| file://:0:0:0:0 | const __va_list_tag | 24 | +| file://:0:0:0:0 | const __va_list_tag & | 8 | | file://:0:0:0:0 | const char | 1 | | file://:0:0:0:0 | const char * | 8 | | file://:0:0:0:0 | const char *const | 8 | diff --git a/cpp/ql/test/library-tests/typedefs/Typedefs1.expected b/cpp/ql/test/library-tests/typedefs/Typedefs1.expected index 21b506c015a4..3a746521e336 100644 --- a/cpp/ql/test/library-tests/typedefs/Typedefs1.expected +++ b/cpp/ql/test/library-tests/typedefs/Typedefs1.expected @@ -3,6 +3,8 @@ | file://:0:0:0:0 | (global namespace) | ODASA-6095-B.hpp:4:8:4:18 | MyTemplate2 | | file://:0:0:0:0 | (global namespace) | ODASA-6095-B.hpp:4:8:4:18 | MyTemplate2 | | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | __va_list_tag | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | +| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | | file://:0:0:0:0 | (global namespace) | typedefs.cpp:6:6:6:7 | f1 | | file://:0:0:0:0 | (global namespace) | typedefs.cpp:12:7:12:7 | A | | file://:0:0:0:0 | (global namespace) | typedefs.cpp:26:7:26:7 | B | diff --git a/cpp/ql/test/library-tests/types/types/Types.expected b/cpp/ql/test/library-tests/types/types/Types.expected index 63feb266b6ee..ff44058f8a79 100644 --- a/cpp/ql/test/library-tests/types/types/Types.expected +++ b/cpp/ql/test/library-tests/types/types/Types.expected @@ -1,6 +1,8 @@ | file://:0:0:0:0 | fp_offset | | file://:0:0:0:0 | unsigned int | IntType | | file://:0:0:0:0 | gp_offset | | file://:0:0:0:0 | unsigned int | IntType | | file://:0:0:0:0 | overflow_arg_area | | file://:0:0:0:0 | void * | PointerType, VoidPointerType, base: void | +| file://:0:0:0:0 | p#0 | Parameter | file://:0:0:0:0 | __va_list_tag && | ReferenceType, base: __va_list_tag | +| file://:0:0:0:0 | p#0 | Parameter | file://:0:0:0:0 | const __va_list_tag & | ReferenceType, base: const __va_list_tag | | file://:0:0:0:0 | reg_save_area | | file://:0:0:0:0 | void * | PointerType, VoidPointerType, base: void | | types.cpp:1:12:1:12 | i | | file://:0:0:0:0 | int | IntType | | types.cpp:3:11:3:11 | c | isConst | file://:0:0:0:0 | const int | base: int, isConst | diff --git a/cpp/ql/test/library-tests/unnamed/elements.expected b/cpp/ql/test/library-tests/unnamed/elements.expected index 4aca4dd6877d..8871ae29bfac 100644 --- a/cpp/ql/test/library-tests/unnamed/elements.expected +++ b/cpp/ql/test/library-tests/unnamed/elements.expected @@ -36,7 +36,6 @@ | file://:0:0:0:0 | char32_t | Other | | file://:0:0:0:0 | const | Other | | file://:0:0:0:0 | decltype(nullptr) | Other | -| file://:0:0:0:0 | definition of __va_list_tag | Other | | file://:0:0:0:0 | definition of fp_offset | Other | | file://:0:0:0:0 | definition of gp_offset | Other | | file://:0:0:0:0 | definition of overflow_arg_area | Other | diff --git a/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected b/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected index 60eb41ea55f8..d9407d2b67e9 100644 --- a/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected +++ b/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected @@ -20,11 +20,14 @@ | file://:0:0:0:0 | __float128 | __float128 | | file://:0:0:0:0 | __int128 | __int128 | | file://:0:0:0:0 | __va_list_tag & | __va_list_tag & | +| file://:0:0:0:0 | __va_list_tag && | __va_list_tag && | | file://:0:0:0:0 | auto | auto | | file://:0:0:0:0 | bool | bool | | file://:0:0:0:0 | char | char | | file://:0:0:0:0 | char16_t | char16_t | | file://:0:0:0:0 | char32_t | char32_t | +| file://:0:0:0:0 | const __va_list_tag | __va_list_tag | +| file://:0:0:0:0 | const __va_list_tag & | __va_list_tag & | | file://:0:0:0:0 | decltype(nullptr) | decltype(nullptr) | | file://:0:0:0:0 | double | double | | file://:0:0:0:0 | error | error | diff --git a/cpp/ql/test/library-tests/unspecified_type/unspecified_type/strip_top_level.expected b/cpp/ql/test/library-tests/unspecified_type/unspecified_type/strip_top_level.expected index e6b2fd63da63..6cc7e55a9ee6 100644 --- a/cpp/ql/test/library-tests/unspecified_type/unspecified_type/strip_top_level.expected +++ b/cpp/ql/test/library-tests/unspecified_type/unspecified_type/strip_top_level.expected @@ -1,6 +1,8 @@ | file://:0:0:0:0 | fp_offset | unsigned int | unsigned int | | file://:0:0:0:0 | gp_offset | unsigned int | unsigned int | | file://:0:0:0:0 | overflow_arg_area | pointer to {void} | pointer to {void} | +| file://:0:0:0:0 | p#0 | reference to {const {struct __va_list_tag}} | reference to {const {struct __va_list_tag}} | +| file://:0:0:0:0 | p#0 | rvalue reference to {struct __va_list_tag} | rvalue reference to {struct __va_list_tag} | | file://:0:0:0:0 | reg_save_area | pointer to {void} | pointer to {void} | | unspecified_type.cpp:2:5:2:7 | vv1 | int | int | | unspecified_type.cpp:3:11:3:13 | vv2 | const {int} | int | diff --git a/cpp/ql/test/library-tests/unspecified_type/unspecified_type/unspecified_type.expected b/cpp/ql/test/library-tests/unspecified_type/unspecified_type/unspecified_type.expected index fbdb040c7b3a..25fc70618b65 100644 --- a/cpp/ql/test/library-tests/unspecified_type/unspecified_type/unspecified_type.expected +++ b/cpp/ql/test/library-tests/unspecified_type/unspecified_type/unspecified_type.expected @@ -1,6 +1,8 @@ | file://:0:0:0:0 | fp_offset | unsigned int | unsigned int | | file://:0:0:0:0 | gp_offset | unsigned int | unsigned int | | file://:0:0:0:0 | overflow_arg_area | pointer to {void} | pointer to {void} | +| file://:0:0:0:0 | p#0 | reference to {const {struct __va_list_tag}} | reference to {struct __va_list_tag} | +| file://:0:0:0:0 | p#0 | rvalue reference to {struct __va_list_tag} | rvalue reference to {struct __va_list_tag} | | file://:0:0:0:0 | reg_save_area | pointer to {void} | pointer to {void} | | unspecified_type.cpp:2:5:2:7 | vv1 | int | int | | unspecified_type.cpp:3:11:3:13 | vv2 | const {int} | int | diff --git a/cpp/ql/test/library-tests/variables/variables/types.expected b/cpp/ql/test/library-tests/variables/variables/types.expected index 2cdacdc8608a..f239d2768715 100644 --- a/cpp/ql/test/library-tests/variables/variables/types.expected +++ b/cpp/ql/test/library-tests/variables/variables/types.expected @@ -20,6 +20,7 @@ | __int128 | Int128Type | | | | | | __va_list_tag | DirectAccessHolder, MetricClass, Struct, StructLikeClass | | | | | | __va_list_tag & | LValueReferenceType | | __va_list_tag | | | +| __va_list_tag && | RValueReferenceType | | __va_list_tag | | | | address | DirectAccessHolder, MetricClass, Struct, StructLikeClass | | | | | | address & | LValueReferenceType | | address | | | | address && | RValueReferenceType | | address | | | @@ -41,6 +42,8 @@ | char[10] | ArrayType | char | char | | | | char[53] | ArrayType | char | char | | | | char[] | ArrayType | char | char | | | +| const __va_list_tag | SpecifiedType | | __va_list_tag | | | +| const __va_list_tag & | LValueReferenceType | | const __va_list_tag | | | | const address | SpecifiedType | | address | | | | const address & | LValueReferenceType | | const address | | | | const char | SpecifiedType | | char | | | diff --git a/cpp/ql/test/library-tests/variables/variables/variable.expected b/cpp/ql/test/library-tests/variables/variables/variable.expected index d74162db4401..0599d8400687 100644 --- a/cpp/ql/test/library-tests/variables/variables/variable.expected +++ b/cpp/ql/test/library-tests/variables/variables/variable.expected @@ -1,8 +1,12 @@ | file://:0:0:0:0 | fp_offset | file://:0:0:0:0 | unsigned int | Field | | | | file://:0:0:0:0 | gp_offset | file://:0:0:0:0 | unsigned int | Field | | | | file://:0:0:0:0 | overflow_arg_area | file://:0:0:0:0 | void * | Field | | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag && | SemanticStackVariable | | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | __va_list_tag && | StackVariable | | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | address && | SemanticStackVariable | | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | address && | StackVariable | | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const __va_list_tag & | SemanticStackVariable | | | +| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const __va_list_tag & | StackVariable | | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const address & | SemanticStackVariable | | | | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | const address & | StackVariable | | | | file://:0:0:0:0 | reg_save_area | file://:0:0:0:0 | void * | Field | | | diff --git a/cpp/ql/test/library-tests/vector_types/variables.expected b/cpp/ql/test/library-tests/vector_types/variables.expected index c899e3dc7b67..225d18dd9afb 100644 --- a/cpp/ql/test/library-tests/vector_types/variables.expected +++ b/cpp/ql/test/library-tests/vector_types/variables.expected @@ -1,6 +1,17 @@ | file://:0:0:0:0 | fp_offset | fp_offset | file://:0:0:0:0 | unsigned int | 4 | | file://:0:0:0:0 | gp_offset | gp_offset | file://:0:0:0:0 | unsigned int | 4 | | file://:0:0:0:0 | overflow_arg_area | overflow_arg_area | file://:0:0:0:0 | void * | 8 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | __attribute((vector_size(16))) double | 16 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | __attribute((vector_size(16))) float | 16 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | __va_list_tag && | 8 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | const __va_list_tag & | 8 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | double * | 8 | +| file://:0:0:0:0 | p#0 | p#0 | file://:0:0:0:0 | float * | 8 | +| file://:0:0:0:0 | p#1 | p#1 | file://:0:0:0:0 | __attribute((vector_size(16))) double | 16 | +| file://:0:0:0:0 | p#1 | p#1 | file://:0:0:0:0 | __attribute((vector_size(16))) double | 16 | +| file://:0:0:0:0 | p#1 | p#1 | file://:0:0:0:0 | __attribute((vector_size(16))) float | 16 | +| file://:0:0:0:0 | p#1 | p#1 | file://:0:0:0:0 | __attribute((vector_size(16))) float | 16 | +| file://:0:0:0:0 | p#2 | p#2 | file://:0:0:0:0 | char | 1 | | file://:0:0:0:0 | reg_save_area | reg_save_area | file://:0:0:0:0 | void * | 8 | | vector_types.cpp:9:21:9:21 | x | x | vector_types.cpp:6:15:6:17 | v4f | 16 | | vector_types.cpp:14:18:14:20 | lhs | lhs | vector_types.cpp:6:15:6:17 | v4f | 16 | diff --git a/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.expected b/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.expected index fae05c1383f2..bffff48414ce 100644 --- a/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.expected +++ b/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.expected @@ -1,149 +1,149 @@ -| Base::Base | false | 137 | 137 | Base | -| Base::Base | false | 140 | 140 | return ... | -| Base::Base | false | 142 | 142 | { ... } | -| Base::Base | false | 156 | 156 | Base | -| Base::Base | false | 158 | 158 | Base | -| Base::Base | true | 140 | 137 | | -| Base::Base | true | 142 | 140 | | -| Base::Base_f | false | 80 | 80 | Base_f | -| Base::Base_f | false | 86 | 86 | call to f | -| Base::Base_f | false | 89 | 89 | this | -| Base::Base_f | false | 90 | 90 | initializer for i | -| Base::Base_f | false | 93 | 93 | declaration | -| Base::Base_f | false | 97 | 97 | 1 | -| Base::Base_f | false | 98 | 98 | return ... | -| Base::Base_f | false | 100 | 100 | { ... } | -| Base::Base_f | true | 89 | 86 | | -| Base::Base_f | true | 90 | 89 | | -| Base::Base_f | true | 93 | 90 | | -| Base::Base_f | true | 97 | 80 | | -| Base::Base_f | true | 98 | 97 | | -| Base::Base_f | true | 100 | 93 | | -| Base::Base_g | false | 114 | 114 | Base_g | -| Base::Base_g | false | 120 | 120 | call to g | -| Base::Base_g | false | 123 | 123 | this | -| Base::Base_g | false | 124 | 124 | initializer for i | -| Base::Base_g | false | 127 | 127 | declaration | -| Base::Base_g | false | 131 | 131 | 4 | -| Base::Base_g | false | 132 | 132 | return ... | -| Base::Base_g | false | 134 | 134 | { ... } | -| Base::Base_g | true | 120 | 132 | | -| Base::Base_g | true | 123 | 120 | | -| Base::Base_g | true | 124 | 123 | | -| Base::Base_g | true | 127 | 124 | | -| Base::Base_g | true | 131 | 114 | | -| Base::Base_g | true | 132 | 131 | | -| Base::Base_g | true | 134 | 127 | | -| Base::f | false | 68 | 68 | f | -| Base::f | false | 71 | 71 | call to abort | -| Base::f | false | 73 | 73 | ExprStmt | -| Base::f | false | 75 | 75 | return ... | -| Base::f | false | 77 | 77 | { ... } | -| Base::f | true | 73 | 71 | | -| Base::f | true | 75 | 68 | | -| Base::f | true | 77 | 73 | | -| Base::g | false | 103 | 103 | g | -| Base::g | false | 108 | 108 | 3 | -| Base::g | false | 109 | 109 | return ... | -| Base::g | false | 111 | 111 | { ... } | -| Base::g | true | 108 | 103 | | -| Base::g | true | 109 | 108 | | -| Base::g | true | 111 | 109 | | -| Base::operator= | false | 148 | 148 | operator= | -| Base::operator= | false | 154 | 154 | operator= | -| __va_list_tag::operator= | false | 54 | 54 | operator= | -| __va_list_tag::operator= | false | 60 | 60 | operator= | -| abort | false | 64 | 64 | abort | -| fun_f1 | false | 170 | 170 | fun_f1 | -| fun_f1 | false | 179 | 179 | call to Base | -| fun_f1 | false | 180 | 180 | new | -| fun_f1 | false | 182 | 182 | initializer for p1 | -| fun_f1 | false | 186 | 186 | declaration | -| fun_f1 | false | 189 | 189 | call to f | -| fun_f1 | false | 191 | 191 | p1 | -| fun_f1 | false | 193 | 193 | initializer for i | -| fun_f1 | false | 197 | 197 | declaration | -| fun_f1 | false | 201 | 201 | 2 | -| fun_f1 | false | 202 | 202 | return ... | -| fun_f1 | false | 204 | 204 | { ... } | -| fun_f1 | true | 179 | 180 | | -| fun_f1 | true | 180 | 197 | | -| fun_f1 | true | 182 | 179 | | -| fun_f1 | true | 186 | 182 | | -| fun_f1 | true | 189 | 202 | | -| fun_f1 | true | 191 | 189 | | -| fun_f1 | true | 193 | 191 | | -| fun_f1 | true | 197 | 193 | | -| fun_f1 | true | 201 | 170 | | -| fun_f1 | true | 202 | 201 | | -| fun_f1 | true | 204 | 186 | | -| fun_f2 | false | 207 | 207 | fun_f2 | -| fun_f2 | false | 211 | 211 | call to Base | -| fun_f2 | false | 212 | 212 | new | -| fun_f2 | false | 214 | 214 | initializer for p1 | -| fun_f2 | false | 218 | 218 | declaration | -| fun_f2 | false | 223 | 223 | call to f | -| fun_f2 | false | 225 | 225 | p1 | -| fun_f2 | false | 227 | 227 | initializer for i | -| fun_f2 | false | 231 | 231 | declaration | -| fun_f2 | false | 235 | 235 | 2 | -| fun_f2 | false | 236 | 236 | return ... | -| fun_f2 | false | 238 | 238 | { ... } | -| fun_f2 | true | 211 | 212 | | -| fun_f2 | true | 212 | 231 | | -| fun_f2 | true | 214 | 211 | | -| fun_f2 | true | 218 | 214 | | -| fun_f2 | true | 225 | 223 | | -| fun_f2 | true | 227 | 225 | | -| fun_f2 | true | 231 | 227 | | -| fun_f2 | true | 235 | 207 | | -| fun_f2 | true | 236 | 235 | | -| fun_f2 | true | 238 | 218 | | -| fun_g1 | false | 241 | 241 | fun_g1 | -| fun_g1 | false | 245 | 245 | call to Base | -| fun_g1 | false | 246 | 246 | new | -| fun_g1 | false | 248 | 248 | initializer for p1 | -| fun_g1 | false | 252 | 252 | declaration | -| fun_g1 | false | 255 | 255 | call to g | -| fun_g1 | false | 257 | 257 | p1 | -| fun_g1 | false | 259 | 259 | initializer for i | -| fun_g1 | false | 263 | 263 | declaration | -| fun_g1 | false | 267 | 267 | 2 | -| fun_g1 | false | 268 | 268 | return ... | -| fun_g1 | false | 270 | 270 | { ... } | -| fun_g1 | true | 245 | 246 | | -| fun_g1 | true | 246 | 263 | | -| fun_g1 | true | 248 | 245 | | -| fun_g1 | true | 252 | 248 | | -| fun_g1 | true | 255 | 268 | | -| fun_g1 | true | 257 | 255 | | -| fun_g1 | true | 259 | 257 | | -| fun_g1 | true | 263 | 259 | | -| fun_g1 | true | 267 | 241 | | -| fun_g1 | true | 268 | 267 | | -| fun_g1 | true | 270 | 252 | | -| fun_g2 | false | 273 | 273 | fun_g2 | -| fun_g2 | false | 277 | 277 | call to Base | -| fun_g2 | false | 278 | 278 | new | -| fun_g2 | false | 280 | 280 | initializer for p1 | -| fun_g2 | false | 284 | 284 | declaration | -| fun_g2 | false | 289 | 289 | call to g | -| fun_g2 | false | 291 | 291 | p1 | -| fun_g2 | false | 293 | 293 | initializer for i | -| fun_g2 | false | 297 | 297 | declaration | -| fun_g2 | false | 301 | 301 | 2 | -| fun_g2 | false | 302 | 302 | return ... | -| fun_g2 | false | 304 | 304 | { ... } | -| fun_g2 | true | 277 | 278 | | -| fun_g2 | true | 278 | 297 | | -| fun_g2 | true | 280 | 277 | | -| fun_g2 | true | 284 | 280 | | -| fun_g2 | true | 289 | 302 | | -| fun_g2 | true | 291 | 289 | | -| fun_g2 | true | 293 | 291 | | -| fun_g2 | true | 297 | 293 | | -| fun_g2 | true | 301 | 273 | | -| fun_g2 | true | 302 | 301 | | -| fun_g2 | true | 304 | 284 | | -| operator delete | false | 177 | 177 | operator delete | -| operator new | false | 174 | 174 | operator new | +| Base::Base | false | 216 | 216 | Base | +| Base::Base | false | 221 | 221 | return ... | +| Base::Base | false | 223 | 223 | { ... } | +| Base::Base | false | 364 | 364 | Base | +| Base::Base | false | 368 | 368 | Base | +| Base::Base | true | 221 | 216 | | +| Base::Base | true | 223 | 221 | | +| Base::Base_f | false | 408 | 408 | Base_f | +| Base::Base_f | false | 413 | 413 | declaration | +| Base::Base_f | false | 417 | 417 | 1 | +| Base::Base_f | false | 418 | 418 | return ... | +| Base::Base_f | false | 420 | 420 | { ... } | +| Base::Base_f | false | 425 | 425 | call to f | +| Base::Base_f | false | 427 | 427 | this | +| Base::Base_f | false | 428 | 428 | initializer for i | +| Base::Base_f | true | 413 | 428 | | +| Base::Base_f | true | 417 | 408 | | +| Base::Base_f | true | 418 | 417 | | +| Base::Base_f | true | 420 | 413 | | +| Base::Base_f | true | 427 | 425 | | +| Base::Base_f | true | 428 | 427 | | +| Base::Base_g | false | 372 | 372 | Base_g | +| Base::Base_g | false | 377 | 377 | declaration | +| Base::Base_g | false | 381 | 381 | 4 | +| Base::Base_g | false | 382 | 382 | return ... | +| Base::Base_g | false | 384 | 384 | { ... } | +| Base::Base_g | false | 389 | 389 | call to g | +| Base::Base_g | false | 392 | 392 | this | +| Base::Base_g | false | 393 | 393 | initializer for i | +| Base::Base_g | true | 377 | 393 | | +| Base::Base_g | true | 381 | 372 | | +| Base::Base_g | true | 382 | 381 | | +| Base::Base_g | true | 384 | 377 | | +| Base::Base_g | true | 389 | 382 | | +| Base::Base_g | true | 392 | 389 | | +| Base::Base_g | true | 393 | 392 | | +| Base::f | false | 302 | 302 | f | +| Base::f | false | 438 | 438 | call to abort | +| Base::f | false | 440 | 440 | ExprStmt | +| Base::f | false | 442 | 442 | return ... | +| Base::f | false | 444 | 444 | { ... } | +| Base::f | true | 440 | 438 | | +| Base::f | true | 442 | 302 | | +| Base::f | true | 444 | 440 | | +| Base::g | false | 231 | 231 | g | +| Base::g | false | 403 | 403 | 3 | +| Base::g | false | 404 | 404 | return ... | +| Base::g | false | 406 | 406 | { ... } | +| Base::g | true | 403 | 231 | | +| Base::g | true | 404 | 403 | | +| Base::g | true | 406 | 404 | | +| Base::operator= | false | 350 | 350 | operator= | +| Base::operator= | false | 360 | 360 | operator= | +| abort | false | 346 | 346 | abort | +| fun_f1 | false | 313 | 313 | fun_f1 | +| fun_f1 | false | 318 | 318 | declaration | +| fun_f1 | false | 320 | 320 | declaration | +| fun_f1 | false | 324 | 324 | 2 | +| fun_f1 | false | 325 | 325 | return ... | +| fun_f1 | false | 327 | 327 | { ... } | +| fun_f1 | false | 330 | 330 | call to Base | +| fun_f1 | false | 331 | 331 | new | +| fun_f1 | false | 333 | 333 | initializer for p1 | +| fun_f1 | false | 338 | 338 | call to f | +| fun_f1 | false | 340 | 340 | p1 | +| fun_f1 | false | 342 | 342 | initializer for i | +| fun_f1 | true | 318 | 333 | | +| fun_f1 | true | 320 | 342 | | +| fun_f1 | true | 324 | 313 | | +| fun_f1 | true | 325 | 324 | | +| fun_f1 | true | 327 | 318 | | +| fun_f1 | true | 330 | 331 | | +| fun_f1 | true | 331 | 320 | | +| fun_f1 | true | 333 | 330 | | +| fun_f1 | true | 338 | 325 | | +| fun_f1 | true | 340 | 338 | | +| fun_f1 | true | 342 | 340 | | +| fun_f2 | false | 277 | 277 | fun_f2 | +| fun_f2 | false | 282 | 282 | declaration | +| fun_f2 | false | 284 | 284 | declaration | +| fun_f2 | false | 288 | 288 | 2 | +| fun_f2 | false | 289 | 289 | return ... | +| fun_f2 | false | 291 | 291 | { ... } | +| fun_f2 | false | 294 | 294 | call to Base | +| fun_f2 | false | 295 | 295 | new | +| fun_f2 | false | 297 | 297 | initializer for p1 | +| fun_f2 | false | 305 | 305 | call to f | +| fun_f2 | false | 307 | 307 | p1 | +| fun_f2 | false | 309 | 309 | initializer for i | +| fun_f2 | true | 282 | 297 | | +| fun_f2 | true | 284 | 309 | | +| fun_f2 | true | 288 | 277 | | +| fun_f2 | true | 289 | 288 | | +| fun_f2 | true | 291 | 282 | | +| fun_f2 | true | 294 | 295 | | +| fun_f2 | true | 295 | 284 | | +| fun_f2 | true | 297 | 294 | | +| fun_f2 | true | 307 | 305 | | +| fun_f2 | true | 309 | 307 | | +| fun_g1 | false | 244 | 244 | fun_g1 | +| fun_g1 | false | 249 | 249 | declaration | +| fun_g1 | false | 251 | 251 | declaration | +| fun_g1 | false | 255 | 255 | 2 | +| fun_g1 | false | 256 | 256 | return ... | +| fun_g1 | false | 258 | 258 | { ... } | +| fun_g1 | false | 261 | 261 | call to Base | +| fun_g1 | false | 262 | 262 | new | +| fun_g1 | false | 264 | 264 | initializer for p1 | +| fun_g1 | false | 269 | 269 | call to g | +| fun_g1 | false | 271 | 271 | p1 | +| fun_g1 | false | 273 | 273 | initializer for i | +| fun_g1 | true | 249 | 264 | | +| fun_g1 | true | 251 | 273 | | +| fun_g1 | true | 255 | 244 | | +| fun_g1 | true | 256 | 255 | | +| fun_g1 | true | 258 | 249 | | +| fun_g1 | true | 261 | 262 | | +| fun_g1 | true | 262 | 251 | | +| fun_g1 | true | 264 | 261 | | +| fun_g1 | true | 269 | 256 | | +| fun_g1 | true | 271 | 269 | | +| fun_g1 | true | 273 | 271 | | +| fun_g2 | false | 193 | 193 | fun_g2 | +| fun_g2 | false | 198 | 198 | declaration | +| fun_g2 | false | 200 | 200 | declaration | +| fun_g2 | false | 204 | 204 | 2 | +| fun_g2 | false | 205 | 205 | return ... | +| fun_g2 | false | 207 | 207 | { ... } | +| fun_g2 | false | 215 | 215 | call to Base | +| fun_g2 | false | 224 | 224 | new | +| fun_g2 | false | 226 | 226 | initializer for p1 | +| fun_g2 | false | 236 | 236 | call to g | +| fun_g2 | false | 238 | 238 | p1 | +| fun_g2 | false | 240 | 240 | initializer for i | +| fun_g2 | true | 198 | 226 | | +| fun_g2 | true | 200 | 240 | | +| fun_g2 | true | 204 | 193 | | +| fun_g2 | true | 205 | 204 | | +| fun_g2 | true | 207 | 198 | | +| fun_g2 | true | 215 | 224 | | +| fun_g2 | true | 224 | 200 | | +| fun_g2 | true | 226 | 215 | | +| fun_g2 | true | 236 | 205 | | +| fun_g2 | true | 238 | 236 | | +| fun_g2 | true | 240 | 238 | | +| operator delete | false | 213 | 213 | operator delete | +| operator new | false | 211 | 211 | operator new | +| operator= | false | 92 | 92 | operator= | +| operator= | false | 99 | 99 | operator= | diff --git a/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected index 98813c7be00c..2cb34ff10acf 100644 --- a/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected +++ b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected @@ -13,6 +13,9 @@ | constants.h:153:10:153:12 | 129 | Magic constant: literal '129' is repeated 31 times and should be encapsulated in a constant. | | constants.h:153:10:153:12 | 129 | Magic constant: literal '129' is repeated 31 times and should be encapsulated in a constant. | | functions.h:3:2:3:4 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | +| functions.h:3:2:3:4 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | +| functions.h:3:8:3:10 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | | functions.h:3:8:3:10 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | | functions.h:3:14:3:16 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | +| functions.h:3:14:3:16 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | | functions.h:12:11:12:13 | 103 | Magic constant: literal '103' is repeated 21 times and should be encapsulated in a constant. | diff --git a/cpp/ql/test/query-tests/Likely Bugs/ReturnConstTypeMember/ReturnConstTypeMember.expected b/cpp/ql/test/query-tests/Likely Bugs/ReturnConstTypeMember/ReturnConstTypeMember.expected index 83bf42666754..02c5f0868f4b 100644 --- a/cpp/ql/test/query-tests/Likely Bugs/ReturnConstTypeMember/ReturnConstTypeMember.expected +++ b/cpp/ql/test/query-tests/Likely Bugs/ReturnConstTypeMember/ReturnConstTypeMember.expected @@ -1,4 +1,4 @@ -| templates.cpp:13:7:13:9 | fun | The 'const' modifier has no effect on return types. The 'const' modifying the return type can be removed. | +| templates.cpp:13:7:13:7 | fun | The 'const' modifier has no effect on return types. The 'const' modifying the return type can be removed. | | test.cpp:5:12:5:23 | getAConstInt | The 'const' modifier has no effect on return types. For a const function, the 'const' should go after the parameter list. | | test.cpp:11:12:11:28 | getAConstIntConst | The 'const' modifier has no effect on return types. The 'const' modifying the return type can be removed. | | test.cpp:19:19:19:36 | getAStaticConstInt | The 'const' modifier has no effect on return types. The 'const' modifying the return type can be removed. | diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected index 8c5deabdc0e3..6c93362a0961 100644 --- a/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected +++ b/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected @@ -1,11 +1,11 @@ | file://:0:0:0:0 | declaration of 1st parameter | LibB/libb_internal.h:5:8:5:12 | thing | | file://:0:0:0:0 | declaration of 1st parameter | LibB/libb_internal.h:5:8:5:12 | thing | | include.h:3:25:3:33 | num | LibD/libd.h:5:12:5:14 | num | -| main.cpp:8:31:8:31 | call to container | LibC/libc.h:9:3:9:11 | container | +| main.cpp:8:31:8:31 | call to container | LibC/libc.h:9:3:9:3 | container | | main.cpp:8:31:8:31 | definition of x | LibB/libb_internal.h:5:8:5:12 | thing | | main.cpp:8:31:8:31 | definition of x | LibC/libc.h:5:18:5:18 | T | | main.cpp:8:31:8:31 | definition of x | LibC/libc.h:6:8:6:16 | container | | main.cpp:8:31:8:31 | definition of x | LibC/libc.h:6:8:6:16 | container | | main.cpp:10:2:10:10 | call to fun | LibA/liba.h:5:7:5:9 | fun | | main.cpp:12:9:12:19 | include_num | include.h:3:11:3:21 | include_num | -| main.cpp:13:1:13:1 | call to ~container | LibC/libc.h:10:3:10:12 | ~container | +| main.cpp:13:1:13:1 | call to ~container | LibC/libc.h:10:3:10:3 | ~container | diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 82/AV Rule 82.expected b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 82/AV Rule 82.expected index 0981be469c3e..15e166499d48 100644 --- a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 82/AV Rule 82.expected +++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 82/AV Rule 82.expected @@ -1,4 +1,4 @@ | AV Rule 82.cpp:18:9:18:17 | operator= | Assignment operator in class Bad1 does not return a reference to *this. | | AV Rule 82.cpp:24:8:24:16 | operator= | Assignment operator in class Bad2 should have return type Bad2&. Otherwise a copy is created at each call. | +| AV Rule 82.cpp:63:29:63:29 | operator= | Assignment operator in class TemplateReturnAssignment does not return a reference to *this. | | AV Rule 82.cpp:63:29:63:37 | operator= | Assignment operator in class TemplateReturnAssignment does not return a reference to *this. | -| AV Rule 82.cpp:63:29:63:37 | operator= | Assignment operator in class TemplateReturnAssignment does not return a reference to *this. | diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 85/AV Rule 85.expected b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 85/AV Rule 85.expected index 379cab5c1d60..257053ccd577 100644 --- a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 85/AV Rule 85.expected +++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 85/AV Rule 85.expected @@ -11,10 +11,6 @@ | AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator<= is declared on line 56, but it is not defined in terms of its opposite operator operator>. | | AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator> is declared on line 55, but it is not defined in terms of its opposite operator operator<=. | | AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator>= is declared on line 53, but it is not defined in terms of its opposite operator operator<. | -| AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator< is declared on line 52, but it is not defined in terms of its opposite operator operator>=. | -| AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator<= is declared on line 56, but it is not defined in terms of its opposite operator operator>. | -| AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator> is declared on line 55, but it is not defined in terms of its opposite operator operator<=. | -| AV Rule 85.cpp:49:7:49:14 | MyClass6 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator>= is declared on line 53, but it is not defined in terms of its opposite operator operator<. | | AV Rule 85.cpp:62:7:62:14 | MyClass7 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator< is declared on line 66, but it is not defined in terms of its opposite operator operator>=. | | AV Rule 85.cpp:62:7:62:14 | MyClass7 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator<= is declared on line 73, but it is not defined in terms of its opposite operator operator>. | | AV Rule 85.cpp:62:7:62:14 | MyClass7 | When two operators are opposites, both should be defined and one should be defined in terms of the other. Operator operator> is declared on line 71, but it is not defined in terms of its opposite operator operator<=. | diff --git a/cpp/ql/test/successor-tests/conditional_destructors/cfg.expected b/cpp/ql/test/successor-tests/conditional_destructors/cfg.expected index 9b11047f62f7..d5871d1b909c 100644 --- a/cpp/ql/test/successor-tests/conditional_destructors/cfg.expected +++ b/cpp/ql/test/successor-tests/conditional_destructors/cfg.expected @@ -1,167 +1,167 @@ -| C1::C1 | false | 131 | 131 | C1 | -| C1::C1 | false | 136 | 136 | this | -| C1::C1 | false | 137 | 137 | val | -| C1::C1 | false | 139 | 139 | x | -| C1::C1 | false | 141 | 141 | ... = ... | -| C1::C1 | false | 143 | 143 | ExprStmt | -| C1::C1 | false | 145 | 145 | return ... | -| C1::C1 | false | 147 | 147 | { ... } | -| C1::C1 | false | 178 | 178 | C1 | -| C1::C1 | false | 180 | 180 | C1 | -| C1::C1 | true | 136 | 137 | | -| C1::C1 | true | 137 | 141 | | -| C1::C1 | true | 139 | 136 | | -| C1::C1 | true | 141 | 145 | | -| C1::C1 | true | 143 | 139 | | -| C1::C1 | true | 145 | 131 | | -| C1::C1 | true | 147 | 143 | | -| C1::operator= | false | 174 | 174 | operator= | -| C1::operator= | false | 176 | 176 | operator= | -| C1::operator== | false | 153 | 153 | operator== | -| C1::operator== | false | 158 | 158 | this | -| C1::operator== | false | 159 | 159 | val | -| C1::operator== | false | 161 | 161 | other | -| C1::operator== | false | 163 | 163 | (reference dereference) | -| C1::operator== | false | 165 | 165 | val | -| C1::operator== | false | 167 | 167 | ... == ... | -| C1::operator== | false | 169 | 169 | return ... | -| C1::operator== | false | 171 | 171 | { ... } | -| C1::operator== | true | 158 | 159 | | -| C1::operator== | true | 159 | 161 | | -| C1::operator== | true | 161 | 165 | | -| C1::operator== | true | 165 | 167 | | -| C1::operator== | true | 167 | 153 | | -| C1::operator== | true | 169 | 158 | | -| C1::operator== | true | 171 | 169 | | -| C2::C2 | false | 195 | 195 | C2 | -| C2::C2 | false | 200 | 200 | this | -| C2::C2 | false | 201 | 201 | val | -| C2::C2 | false | 203 | 203 | x | -| C2::C2 | false | 205 | 205 | ... = ... | -| C2::C2 | false | 207 | 207 | ExprStmt | -| C2::C2 | false | 209 | 209 | return ... | -| C2::C2 | false | 211 | 211 | { ... } | -| C2::C2 | false | 250 | 250 | C2 | -| C2::C2 | true | 200 | 201 | | -| C2::C2 | true | 201 | 205 | | -| C2::C2 | true | 203 | 200 | | -| C2::C2 | true | 205 | 209 | | -| C2::C2 | true | 207 | 203 | | -| C2::C2 | true | 209 | 195 | | -| C2::C2 | true | 211 | 207 | | -| C2::operator= | false | 248 | 248 | operator= | -| C2::operator== | false | 228 | 228 | operator== | -| C2::operator== | false | 233 | 233 | this | -| C2::operator== | false | 234 | 234 | val | -| C2::operator== | false | 236 | 236 | other | -| C2::operator== | false | 238 | 238 | (reference dereference) | -| C2::operator== | false | 240 | 240 | val | -| C2::operator== | false | 242 | 242 | ... == ... | -| C2::operator== | false | 244 | 244 | return ... | -| C2::operator== | false | 246 | 246 | { ... } | -| C2::operator== | true | 233 | 234 | | -| C2::operator== | true | 234 | 236 | | -| C2::operator== | true | 236 | 240 | | -| C2::operator== | true | 240 | 242 | | -| C2::operator== | true | 242 | 228 | | -| C2::operator== | true | 244 | 233 | | -| C2::operator== | true | 246 | 244 | | -| C2::~C2 | false | 214 | 214 | ~C2 | -| C2::~C2 | false | 218 | 218 | ; | -| C2::~C2 | false | 220 | 220 | return ... | -| C2::~C2 | false | 222 | 222 | { ... } | -| C2::~C2 | true | 218 | 220 | | -| C2::~C2 | true | 220 | 214 | | -| C2::~C2 | true | 222 | 218 | | -| __va_list_tag::operator= | false | 61 | 61 | operator= | -| __va_list_tag::operator= | false | 65 | 65 | operator= | -| f1 | false | 260 | 260 | f1 | -| f1 | false | 268 | 268 | call to operator== | -| f1 | false | 269 | 269 | call to C1 | -| f1 | false | 273 | 273 | 1 | -| f1 | false | 274 | 274 | (const C1)... | -| f1 | false | 276 | 276 | call to C1 | -| f1 | false | 280 | 280 | 2 | -| f1 | false | 281 | 281 | (const C1)... | -| f1 | false | 283 | 283 | (reference to) | -| f1 | false | 285 | 285 | ; | -| f1 | false | 287 | 287 | { ... } | -| f1 | false | 289 | 289 | if (...) ... | -| f1 | false | 292 | 292 | call to operator== | -| f1 | false | 293 | 293 | call to C1 | -| f1 | false | 297 | 297 | 3 | -| f1 | false | 298 | 298 | (const C1)... | -| f1 | false | 300 | 300 | call to C1 | -| f1 | false | 304 | 304 | 3 | -| f1 | false | 305 | 305 | (const C1)... | -| f1 | false | 307 | 307 | (reference to) | -| f1 | false | 309 | 309 | ; | -| f1 | false | 311 | 311 | { ... } | -| f1 | false | 313 | 313 | if (...) ... | -| f1 | false | 315 | 315 | return ... | -| f1 | false | 317 | 317 | { ... } | -| f1 | true | 268 | 287 | T | -| f1 | true | 268 | 313 | F | -| f1 | true | 269 | 268 | | -| f1 | true | 273 | 269 | | -| f1 | true | 276 | 273 | | -| f1 | true | 280 | 276 | | -| f1 | true | 285 | 313 | | -| f1 | true | 287 | 285 | | -| f1 | true | 289 | 280 | | -| f1 | true | 292 | 311 | T | -| f1 | true | 292 | 315 | F | -| f1 | true | 293 | 292 | | -| f1 | true | 297 | 293 | | -| f1 | true | 300 | 297 | | -| f1 | true | 304 | 300 | | -| f1 | true | 309 | 315 | | -| f1 | true | 311 | 309 | | -| f1 | true | 313 | 304 | | -| f1 | true | 315 | 260 | | -| f1 | true | 317 | 289 | | -| f2 | false | 320 | 320 | f2 | -| f2 | false | 328 | 328 | call to operator== | -| f2 | false | 329 | 329 | call to C2 | -| f2 | false | 333 | 333 | 1 | -| f2 | false | 334 | 334 | (const C2)... | -| f2 | false | 336 | 336 | call to C2 | -| f2 | false | 340 | 340 | 2 | -| f2 | false | 341 | 341 | (const C2)... | -| f2 | false | 343 | 343 | (reference to) | -| f2 | false | 345 | 345 | ; | -| f2 | false | 347 | 347 | { ... } | -| f2 | false | 349 | 349 | if (...) ... | -| f2 | false | 352 | 352 | call to operator== | -| f2 | false | 353 | 353 | call to C2 | -| f2 | false | 357 | 357 | 3 | -| f2 | false | 358 | 358 | (const C2)... | -| f2 | false | 360 | 360 | call to C2 | -| f2 | false | 364 | 364 | 3 | -| f2 | false | 365 | 365 | (const C2)... | -| f2 | false | 367 | 367 | (reference to) | -| f2 | false | 369 | 369 | ; | -| f2 | false | 371 | 371 | { ... } | -| f2 | false | 373 | 373 | if (...) ... | -| f2 | false | 375 | 375 | return ... | -| f2 | false | 377 | 377 | { ... } | -| f2 | true | 328 | 347 | T | -| f2 | true | 328 | 373 | F | -| f2 | true | 329 | 328 | | -| f2 | true | 333 | 329 | | -| f2 | true | 336 | 333 | | -| f2 | true | 340 | 336 | | -| f2 | true | 345 | 373 | | -| f2 | true | 347 | 345 | | -| f2 | true | 349 | 340 | | -| f2 | true | 352 | 371 | T | -| f2 | true | 352 | 375 | F | -| f2 | true | 353 | 352 | | -| f2 | true | 357 | 353 | | -| f2 | true | 360 | 357 | | -| f2 | true | 364 | 360 | | -| f2 | true | 369 | 375 | | -| f2 | true | 371 | 369 | | -| f2 | true | 373 | 364 | | -| f2 | true | 375 | 320 | | -| f2 | true | 377 | 349 | | +| C1::C1 | false | 266 | 266 | C1 | +| C1::C1 | false | 388 | 388 | C1 | +| C1::C1 | false | 392 | 392 | C1 | +| C1::C1 | false | 429 | 429 | this | +| C1::C1 | false | 430 | 430 | val | +| C1::C1 | false | 432 | 432 | x | +| C1::C1 | false | 434 | 434 | ... = ... | +| C1::C1 | false | 436 | 436 | ExprStmt | +| C1::C1 | false | 438 | 438 | return ... | +| C1::C1 | false | 440 | 440 | { ... } | +| C1::C1 | true | 429 | 430 | | +| C1::C1 | true | 430 | 434 | | +| C1::C1 | true | 432 | 429 | | +| C1::C1 | true | 434 | 438 | | +| C1::C1 | true | 436 | 432 | | +| C1::C1 | true | 438 | 266 | | +| C1::C1 | true | 440 | 436 | | +| C1::operator= | false | 378 | 378 | operator= | +| C1::operator= | false | 384 | 384 | operator= | +| C1::operator== | false | 256 | 256 | operator== | +| C1::operator== | false | 406 | 406 | this | +| C1::operator== | false | 408 | 408 | val | +| C1::operator== | false | 410 | 410 | other | +| C1::operator== | false | 412 | 412 | (reference dereference) | +| C1::operator== | false | 413 | 413 | val | +| C1::operator== | false | 415 | 415 | ... == ... | +| C1::operator== | false | 417 | 417 | return ... | +| C1::operator== | false | 419 | 419 | { ... } | +| C1::operator== | true | 406 | 408 | | +| C1::operator== | true | 408 | 410 | | +| C1::operator== | true | 410 | 413 | | +| C1::operator== | true | 413 | 415 | | +| C1::operator== | true | 415 | 256 | | +| C1::operator== | true | 417 | 406 | | +| C1::operator== | true | 419 | 417 | | +| C2::C2 | false | 203 | 203 | C2 | +| C2::C2 | false | 315 | 315 | C2 | +| C2::C2 | false | 363 | 363 | this | +| C2::C2 | false | 364 | 364 | val | +| C2::C2 | false | 366 | 366 | x | +| C2::C2 | false | 368 | 368 | ... = ... | +| C2::C2 | false | 370 | 370 | ExprStmt | +| C2::C2 | false | 372 | 372 | return ... | +| C2::C2 | false | 374 | 374 | { ... } | +| C2::C2 | true | 363 | 364 | | +| C2::C2 | true | 364 | 368 | | +| C2::C2 | true | 366 | 363 | | +| C2::C2 | true | 368 | 372 | | +| C2::C2 | true | 370 | 366 | | +| C2::C2 | true | 372 | 203 | | +| C2::C2 | true | 374 | 370 | | +| C2::operator= | false | 309 | 309 | operator= | +| C2::operator== | false | 193 | 193 | operator== | +| C2::operator== | false | 329 | 329 | this | +| C2::operator== | false | 331 | 331 | val | +| C2::operator== | false | 333 | 333 | other | +| C2::operator== | false | 335 | 335 | (reference dereference) | +| C2::operator== | false | 336 | 336 | val | +| C2::operator== | false | 338 | 338 | ... == ... | +| C2::operator== | false | 340 | 340 | return ... | +| C2::operator== | false | 342 | 342 | { ... } | +| C2::operator== | true | 329 | 331 | | +| C2::operator== | true | 331 | 333 | | +| C2::operator== | true | 333 | 336 | | +| C2::operator== | true | 336 | 338 | | +| C2::operator== | true | 338 | 193 | | +| C2::operator== | true | 340 | 329 | | +| C2::operator== | true | 342 | 340 | | +| C2::~C2 | false | 344 | 344 | ~C2 | +| C2::~C2 | false | 349 | 349 | ; | +| C2::~C2 | false | 351 | 351 | return ... | +| C2::~C2 | false | 353 | 353 | { ... } | +| C2::~C2 | true | 349 | 351 | | +| C2::~C2 | true | 351 | 344 | | +| C2::~C2 | true | 353 | 349 | | +| f1 | false | 246 | 246 | f1 | +| f1 | false | 263 | 263 | call to operator== | +| f1 | false | 264 | 264 | call to C1 | +| f1 | false | 269 | 269 | 1 | +| f1 | false | 270 | 270 | (const C1)... | +| f1 | false | 271 | 271 | call to C1 | +| f1 | false | 275 | 275 | 2 | +| f1 | false | 276 | 276 | (const C1)... | +| f1 | false | 277 | 277 | (reference to) | +| f1 | false | 278 | 278 | ; | +| f1 | false | 280 | 280 | { ... } | +| f1 | false | 282 | 282 | if (...) ... | +| f1 | false | 285 | 285 | call to operator== | +| f1 | false | 286 | 286 | call to C1 | +| f1 | false | 290 | 290 | 3 | +| f1 | false | 291 | 291 | (const C1)... | +| f1 | false | 292 | 292 | call to C1 | +| f1 | false | 296 | 296 | 3 | +| f1 | false | 297 | 297 | (const C1)... | +| f1 | false | 298 | 298 | (reference to) | +| f1 | false | 299 | 299 | ; | +| f1 | false | 301 | 301 | { ... } | +| f1 | false | 303 | 303 | if (...) ... | +| f1 | false | 305 | 305 | return ... | +| f1 | false | 307 | 307 | { ... } | +| f1 | true | 263 | 280 | T | +| f1 | true | 263 | 303 | F | +| f1 | true | 264 | 263 | | +| f1 | true | 269 | 264 | | +| f1 | true | 271 | 269 | | +| f1 | true | 275 | 271 | | +| f1 | true | 278 | 303 | | +| f1 | true | 280 | 278 | | +| f1 | true | 282 | 275 | | +| f1 | true | 285 | 301 | T | +| f1 | true | 285 | 305 | F | +| f1 | true | 286 | 285 | | +| f1 | true | 290 | 286 | | +| f1 | true | 292 | 290 | | +| f1 | true | 296 | 292 | | +| f1 | true | 299 | 305 | | +| f1 | true | 301 | 299 | | +| f1 | true | 303 | 296 | | +| f1 | true | 305 | 246 | | +| f1 | true | 307 | 282 | | +| f2 | false | 183 | 183 | f2 | +| f2 | false | 200 | 200 | call to operator== | +| f2 | false | 201 | 201 | call to C2 | +| f2 | false | 206 | 206 | 1 | +| f2 | false | 207 | 207 | (const C2)... | +| f2 | false | 208 | 208 | call to C2 | +| f2 | false | 212 | 212 | 2 | +| f2 | false | 213 | 213 | (const C2)... | +| f2 | false | 214 | 214 | (reference to) | +| f2 | false | 215 | 215 | ; | +| f2 | false | 217 | 217 | { ... } | +| f2 | false | 219 | 219 | if (...) ... | +| f2 | false | 222 | 222 | call to operator== | +| f2 | false | 223 | 223 | call to C2 | +| f2 | false | 227 | 227 | 3 | +| f2 | false | 228 | 228 | (const C2)... | +| f2 | false | 229 | 229 | call to C2 | +| f2 | false | 233 | 233 | 3 | +| f2 | false | 234 | 234 | (const C2)... | +| f2 | false | 235 | 235 | (reference to) | +| f2 | false | 236 | 236 | ; | +| f2 | false | 238 | 238 | { ... } | +| f2 | false | 240 | 240 | if (...) ... | +| f2 | false | 242 | 242 | return ... | +| f2 | false | 244 | 244 | { ... } | +| f2 | true | 200 | 217 | T | +| f2 | true | 200 | 240 | F | +| f2 | true | 201 | 200 | | +| f2 | true | 206 | 201 | | +| f2 | true | 208 | 206 | | +| f2 | true | 212 | 208 | | +| f2 | true | 215 | 240 | | +| f2 | true | 217 | 215 | | +| f2 | true | 219 | 212 | | +| f2 | true | 222 | 238 | T | +| f2 | true | 222 | 242 | F | +| f2 | true | 223 | 222 | | +| f2 | true | 227 | 223 | | +| f2 | true | 229 | 227 | | +| f2 | true | 233 | 229 | | +| f2 | true | 236 | 242 | | +| f2 | true | 238 | 236 | | +| f2 | true | 240 | 233 | | +| f2 | true | 242 | 183 | | +| f2 | true | 244 | 219 | | +| operator= | false | 90 | 90 | operator= | +| operator= | false | 97 | 97 | operator= | diff --git a/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.expected b/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.expected index 76d6a4d32607..97a5f2fc498c 100644 --- a/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.expected +++ b/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.expected @@ -1,59 +1,59 @@ -| __va_list_tag::operator= | false | 61 | 61 | operator= | -| __va_list_tag::operator= | false | 65 | 65 | operator= | -| f | false | 128 | 128 | f | -| f | false | 139 | 139 | 1 | -| f | false | 140 | 140 | throw ... | -| f | false | 142 | 142 | ExprStmt | -| f | false | 144 | 144 | { ... } | -| f | false | 146 | 146 | { ... } | -| f | false | 148 | 148 | { ... } | -| f | false | 150 | 150 | | -| f | false | 151 | 151 | | -| f | false | 152 | 152 | try { ... } | -| f | false | 154 | 154 | { ... } | -| f | false | 156 | 156 | { ... } | -| f | false | 158 | 158 | | -| f | false | 159 | 159 | try { ... } | -| f | false | 161 | 161 | return ... | -| f | false | 163 | 163 | { ... } | -| f | true | 139 | 140 | | -| f | true | 140 | 150 | | -| f | true | 142 | 139 | | -| f | true | 144 | 142 | | -| f | true | 146 | 161 | | -| f | true | 148 | 161 | | -| f | true | 150 | 146 | | -| f | true | 150 | 151 | | -| f | true | 151 | 148 | | -| f | true | 152 | 144 | | -| f | true | 154 | 152 | | -| f | true | 156 | 161 | | -| f | true | 158 | 128 | | -| f | true | 158 | 156 | | -| f | true | 159 | 154 | | -| f | true | 161 | 128 | | -| f | true | 163 | 159 | | -| g | false | 167 | 167 | g | -| g | false | 171 | 171 | condition | -| g | false | 175 | 175 | 1 | -| g | false | 176 | 176 | throw ... | -| g | false | 178 | 178 | ExprStmt | -| g | false | 180 | 180 | if (...) ... | -| g | false | 182 | 182 | { ... } | -| g | false | 184 | 184 | { ... } | -| g | false | 186 | 186 | | -| g | false | 187 | 187 | try { ... } | -| g | false | 189 | 189 | return ... | -| g | false | 191 | 191 | { ... } | -| g | true | 171 | 178 | T | -| g | true | 171 | 189 | F | -| g | true | 175 | 176 | | -| g | true | 176 | 186 | | -| g | true | 178 | 175 | | -| g | true | 180 | 171 | | -| g | true | 182 | 180 | | -| g | true | 184 | 189 | | -| g | true | 186 | 184 | | -| g | true | 187 | 182 | | -| g | true | 189 | 167 | | -| g | true | 191 | 187 | | +| f | false | 175 | 175 | f | +| f | false | 182 | 182 | 1 | +| f | false | 183 | 183 | throw ... | +| f | false | 185 | 185 | ExprStmt | +| f | false | 187 | 187 | { ... } | +| f | false | 192 | 192 | { ... } | +| f | false | 194 | 194 | { ... } | +| f | false | 196 | 196 | | +| f | false | 197 | 197 | | +| f | false | 198 | 198 | try { ... } | +| f | false | 200 | 200 | { ... } | +| f | false | 205 | 205 | { ... } | +| f | false | 207 | 207 | | +| f | false | 208 | 208 | try { ... } | +| f | false | 210 | 210 | return ... | +| f | false | 212 | 212 | { ... } | +| f | true | 182 | 183 | | +| f | true | 183 | 196 | | +| f | true | 185 | 182 | | +| f | true | 187 | 185 | | +| f | true | 192 | 210 | | +| f | true | 194 | 210 | | +| f | true | 196 | 192 | | +| f | true | 196 | 197 | | +| f | true | 197 | 194 | | +| f | true | 198 | 187 | | +| f | true | 200 | 198 | | +| f | true | 205 | 210 | | +| f | true | 207 | 175 | | +| f | true | 207 | 205 | | +| f | true | 208 | 200 | | +| f | true | 210 | 175 | | +| f | true | 212 | 208 | | +| g | false | 145 | 145 | g | +| g | false | 153 | 153 | condition | +| g | false | 157 | 157 | 1 | +| g | false | 158 | 158 | throw ... | +| g | false | 160 | 160 | ExprStmt | +| g | false | 162 | 162 | if (...) ... | +| g | false | 164 | 164 | { ... } | +| g | false | 166 | 166 | { ... } | +| g | false | 168 | 168 | | +| g | false | 169 | 169 | try { ... } | +| g | false | 171 | 171 | return ... | +| g | false | 173 | 173 | { ... } | +| g | true | 153 | 160 | T | +| g | true | 153 | 171 | F | +| g | true | 157 | 158 | | +| g | true | 158 | 168 | | +| g | true | 160 | 157 | | +| g | true | 162 | 153 | | +| g | true | 164 | 162 | | +| g | true | 166 | 171 | | +| g | true | 168 | 166 | | +| g | true | 169 | 164 | | +| g | true | 171 | 145 | | +| g | true | 173 | 169 | | +| operator= | false | 92 | 92 | operator= | +| operator= | false | 99 | 99 | operator= | diff --git a/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.expected b/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.expected index d300a32a9d04..3874ffa28cba 100644 --- a/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.expected +++ b/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.expected @@ -1,67 +1,67 @@ -| C::operator= | false | 129 | 129 | operator= | -| C::operator= | false | 133 | 133 | operator= | -| D::operator= | false | 140 | 140 | operator= | -| D::operator= | false | 144 | 144 | operator= | -| __va_list_tag::operator= | false | 61 | 61 | operator= | -| __va_list_tag::operator= | false | 65 | 65 | operator= | -| f | false | 163 | 163 | f | -| f | false | 180 | 180 | call to g | -| f | false | 182 | 182 | ExprStmt | -| f | false | 186 | 186 | 2 | -| f | false | 187 | 187 | throw ... | -| f | false | 189 | 189 | ExprStmt | -| f | false | 191 | 191 | label ...: | -| f | false | 193 | 193 | { ... } | -| f | false | 197 | 197 | 4 | -| f | false | 198 | 198 | ExprStmt | -| f | false | 200 | 200 | { ... } | -| f | false | 202 | 202 | | -| f | false | 203 | 203 | try { ... } | -| f | false | 205 | 205 | { ... } | -| f | false | 209 | 209 | 5 | -| f | false | 210 | 210 | ExprStmt | -| f | false | 212 | 212 | { ... } | -| f | false | 216 | 216 | 6 | -| f | false | 217 | 217 | ExprStmt | -| f | false | 219 | 219 | { ... } | -| f | false | 221 | 221 | | -| f | false | 222 | 222 | | -| f | false | 223 | 223 | try { ... } | -| f | false | 225 | 225 | return ... | -| f | false | 227 | 227 | { ... } | -| f | true | 180 | 189 | | -| f | true | 182 | 180 | | -| f | true | 186 | 187 | | -| f | true | 187 | 202 | | -| f | true | 189 | 186 | | -| f | true | 191 | 225 | | -| f | true | 193 | 182 | | -| f | true | 197 | 225 | | -| f | true | 198 | 197 | | -| f | true | 200 | 198 | | -| f | true | 202 | 200 | | -| f | true | 202 | 221 | | -| f | true | 203 | 193 | | -| f | true | 205 | 203 | | -| f | true | 209 | 225 | | -| f | true | 210 | 209 | | -| f | true | 212 | 210 | | -| f | true | 216 | 225 | | -| f | true | 217 | 216 | | -| f | true | 219 | 217 | | -| f | true | 221 | 212 | | -| f | true | 221 | 222 | | -| f | true | 222 | 163 | | -| f | true | 222 | 219 | | -| f | true | 223 | 205 | | -| f | true | 225 | 163 | | -| f | true | 227 | 223 | | -| g | false | 150 | 150 | g | -| g | false | 155 | 155 | 1 | -| g | false | 156 | 156 | throw ... | -| g | false | 158 | 158 | ExprStmt | -| g | false | 160 | 160 | { ... } | -| g | true | 155 | 156 | | -| g | true | 156 | 150 | | -| g | true | 158 | 155 | | -| g | true | 160 | 158 | | +| C::operator= | false | 252 | 252 | operator= | +| C::operator= | false | 263 | 263 | operator= | +| D::operator= | false | 234 | 234 | operator= | +| D::operator= | false | 245 | 245 | operator= | +| f | false | 151 | 151 | f | +| f | false | 159 | 159 | call to g | +| f | false | 161 | 161 | ExprStmt | +| f | false | 165 | 165 | 2 | +| f | false | 166 | 166 | throw ... | +| f | false | 168 | 168 | ExprStmt | +| f | false | 170 | 170 | label ...: | +| f | false | 172 | 172 | { ... } | +| f | false | 180 | 180 | 4 | +| f | false | 181 | 181 | ExprStmt | +| f | false | 183 | 183 | { ... } | +| f | false | 185 | 185 | | +| f | false | 186 | 186 | try { ... } | +| f | false | 188 | 188 | { ... } | +| f | false | 195 | 195 | 5 | +| f | false | 196 | 196 | ExprStmt | +| f | false | 198 | 198 | { ... } | +| f | false | 205 | 205 | 6 | +| f | false | 206 | 206 | ExprStmt | +| f | false | 208 | 208 | { ... } | +| f | false | 210 | 210 | | +| f | false | 211 | 211 | | +| f | false | 212 | 212 | try { ... } | +| f | false | 214 | 214 | return ... | +| f | false | 216 | 216 | { ... } | +| f | true | 159 | 168 | | +| f | true | 161 | 159 | | +| f | true | 165 | 166 | | +| f | true | 166 | 185 | | +| f | true | 168 | 165 | | +| f | true | 170 | 214 | | +| f | true | 172 | 161 | | +| f | true | 180 | 214 | | +| f | true | 181 | 180 | | +| f | true | 183 | 181 | | +| f | true | 185 | 183 | | +| f | true | 185 | 210 | | +| f | true | 186 | 172 | | +| f | true | 188 | 186 | | +| f | true | 195 | 214 | | +| f | true | 196 | 195 | | +| f | true | 198 | 196 | | +| f | true | 205 | 214 | | +| f | true | 206 | 205 | | +| f | true | 208 | 206 | | +| f | true | 210 | 198 | | +| f | true | 210 | 211 | | +| f | true | 211 | 151 | | +| f | true | 211 | 208 | | +| f | true | 212 | 188 | | +| f | true | 214 | 151 | | +| f | true | 216 | 212 | | +| g | false | 156 | 156 | g | +| g | false | 224 | 224 | 1 | +| g | false | 225 | 225 | throw ... | +| g | false | 227 | 227 | ExprStmt | +| g | false | 229 | 229 | { ... } | +| g | true | 224 | 225 | | +| g | true | 225 | 156 | | +| g | true | 227 | 224 | | +| g | true | 229 | 227 | | +| operator= | false | 92 | 92 | operator= | +| operator= | false | 99 | 99 | operator= | diff --git a/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected b/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected index 57bc35805e37..a0168c129d6d 100644 --- a/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected +++ b/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.expected @@ -1,512 +1,512 @@ -| BoxedInt::BoxedInt | false | 70 | 70 | BoxedInt | -| BoxedInt::BoxedInt | false | 75 | 75 | this | -| BoxedInt::BoxedInt | false | 76 | 76 | m_ptr | -| BoxedInt::BoxedInt | false | 80 | 80 | x | -| BoxedInt::BoxedInt | false | 82 | 82 | new | -| BoxedInt::BoxedInt | false | 84 | 84 | ... = ... | -| BoxedInt::BoxedInt | false | 86 | 86 | ExprStmt | -| BoxedInt::BoxedInt | false | 88 | 88 | return ... | -| BoxedInt::BoxedInt | false | 90 | 90 | { ... } | -| BoxedInt::BoxedInt | false | 134 | 134 | BoxedInt | -| BoxedInt::BoxedInt | true | 75 | 76 | | -| BoxedInt::BoxedInt | true | 76 | 84 | | -| BoxedInt::BoxedInt | true | 80 | 82 | | -| BoxedInt::BoxedInt | true | 82 | 75 | | -| BoxedInt::BoxedInt | true | 84 | 88 | | -| BoxedInt::BoxedInt | true | 86 | 80 | | -| BoxedInt::BoxedInt | true | 88 | 70 | | -| BoxedInt::BoxedInt | true | 90 | 86 | | -| BoxedInt::operator int | false | 112 | 112 | operator int | -| BoxedInt::operator int | false | 116 | 116 | this | -| BoxedInt::operator int | false | 117 | 117 | m_ptr | -| BoxedInt::operator int | false | 119 | 119 | * ... | -| BoxedInt::operator int | false | 121 | 121 | return ... | -| BoxedInt::operator int | false | 123 | 123 | { ... } | -| BoxedInt::operator int | true | 116 | 117 | | -| BoxedInt::operator int | true | 117 | 119 | | -| BoxedInt::operator int | true | 119 | 112 | | -| BoxedInt::operator int | true | 121 | 116 | | -| BoxedInt::operator int | true | 123 | 121 | | -| BoxedInt::operator= | false | 132 | 132 | operator= | -| BoxedInt::~BoxedInt | false | 93 | 93 | ~BoxedInt | -| BoxedInt::~BoxedInt | false | 100 | 100 | this | -| BoxedInt::~BoxedInt | false | 101 | 101 | m_ptr | -| BoxedInt::~BoxedInt | false | 103 | 103 | delete | -| BoxedInt::~BoxedInt | false | 105 | 105 | ExprStmt | -| BoxedInt::~BoxedInt | false | 107 | 107 | return ... | -| BoxedInt::~BoxedInt | false | 109 | 109 | { ... } | -| BoxedInt::~BoxedInt | true | 100 | 101 | | -| BoxedInt::~BoxedInt | true | 101 | 103 | | -| BoxedInt::~BoxedInt | true | 103 | 107 | | -| BoxedInt::~BoxedInt | true | 105 | 100 | | -| BoxedInt::~BoxedInt | true | 107 | 93 | | -| BoxedInt::~BoxedInt | true | 109 | 105 | | -| NonTrivial::operator= | false | 799 | 799 | operator= | -| NonTrivial::~NonTrivial | false | 480 | 480 | ~NonTrivial | -| NonTrivial::~NonTrivial | false | 788 | 788 | return ... | -| NonTrivial::~NonTrivial | false | 790 | 790 | { ... } | -| NonTrivial::~NonTrivial | true | 788 | 480 | | -| NonTrivial::~NonTrivial | true | 790 | 788 | | -| __va_list_tag::operator= | false | 54 | 54 | operator= | -| __va_list_tag::operator= | false | 60 | 60 | operator= | -| early_return | false | 506 | 506 | early_return | -| early_return | false | 513 | 513 | declaration | -| early_return | false | 515 | 515 | x | -| early_return | false | 517 | 517 | (bool)... | -| early_return | false | 522 | 522 | declaration | -| early_return | false | 524 | 524 | return ... | -| early_return | false | 526 | 526 | { ... } | -| early_return | false | 528 | 528 | if (...) ... | -| early_return | false | 533 | 533 | declaration | -| early_return | false | 535 | 535 | return ... | -| early_return | false | 537 | 537 | { ... } | -| early_return | false | 539 | 539 | before | -| early_return | false | 541 | 541 | call to before.~NonTrivial | -| early_return | false | 542 | 542 | after | -| early_return | false | 543 | 543 | call to after.~NonTrivial | -| early_return | false | 544 | 544 | inner | -| early_return | false | 546 | 546 | call to inner.~NonTrivial | -| early_return | false | 547 | 547 | inner | -| early_return | false | 548 | 548 | call to inner.~NonTrivial | -| early_return | true | 513 | 528 | | -| early_return | true | 515 | 526 | T | -| early_return | true | 515 | 533 | F | -| early_return | true | 522 | 524 | | -| early_return | true | 524 | 547 | | -| early_return | true | 526 | 522 | | -| early_return | true | 528 | 515 | | -| early_return | true | 533 | 535 | | -| early_return | true | 535 | 542 | | -| early_return | true | 537 | 513 | | -| early_return | true | 539 | 541 | | -| early_return | true | 541 | 506 | | -| early_return | true | 542 | 543 | | -| early_return | true | 543 | 539 | | -| early_return | true | 544 | 546 | | -| early_return | true | 546 | 533 | | -| early_return | true | 547 | 548 | | -| early_return | true | 548 | 539 | | -| early_throw | false | 551 | 551 | early_throw | -| early_throw | false | 558 | 558 | declaration | -| early_throw | false | 560 | 560 | x | -| early_throw | false | 562 | 562 | (bool)... | -| early_throw | false | 567 | 567 | declaration | -| early_throw | false | 569 | 569 | re-throw exception | -| early_throw | false | 571 | 571 | ExprStmt | -| early_throw | false | 573 | 573 | { ... } | -| early_throw | false | 575 | 575 | if (...) ... | -| early_throw | false | 580 | 580 | declaration | -| early_throw | false | 582 | 582 | return ... | -| early_throw | false | 584 | 584 | { ... } | -| early_throw | false | 586 | 586 | before | -| early_throw | false | 588 | 588 | call to before.~NonTrivial | -| early_throw | false | 589 | 589 | after | -| early_throw | false | 590 | 590 | call to after.~NonTrivial | -| early_throw | false | 591 | 591 | inner | -| early_throw | false | 593 | 593 | call to inner.~NonTrivial | -| early_throw | false | 594 | 594 | before | -| early_throw | false | 595 | 595 | call to before.~NonTrivial | -| early_throw | false | 596 | 596 | inner | -| early_throw | false | 597 | 597 | call to inner.~NonTrivial | -| early_throw | true | 558 | 575 | | -| early_throw | true | 560 | 573 | T | -| early_throw | true | 560 | 580 | F | -| early_throw | true | 567 | 571 | | -| early_throw | true | 569 | 596 | | -| early_throw | true | 571 | 569 | | -| early_throw | true | 573 | 567 | | -| early_throw | true | 575 | 560 | | -| early_throw | true | 580 | 582 | | -| early_throw | true | 582 | 589 | | -| early_throw | true | 584 | 558 | | -| early_throw | true | 586 | 588 | | -| early_throw | true | 588 | 551 | | -| early_throw | true | 589 | 590 | | -| early_throw | true | 590 | 586 | | -| early_throw | true | 591 | 593 | | -| early_throw | true | 593 | 580 | | -| early_throw | true | 594 | 595 | | -| early_throw | true | 595 | 551 | | -| early_throw | true | 596 | 597 | | -| early_throw | true | 597 | 594 | | -| for_decl_bind | false | 353 | 353 | for_decl_bind | -| for_decl_bind | false | 358 | 358 | call to BoxedInt | -| for_decl_bind | false | 360 | 360 | x | -| for_decl_bind | false | 362 | 362 | - ... | -| for_decl_bind | false | 364 | 364 | initializer for init | -| for_decl_bind | false | 369 | 369 | call to operator int | -| for_decl_bind | false | 371 | 371 | call to BoxedInt | -| for_decl_bind | false | 373 | 373 | x | -| for_decl_bind | false | 375 | 375 | initializer for bi | -| for_decl_bind | false | 379 | 379 | bi | -| for_decl_bind | false | 381 | 381 | (bool)... | -| for_decl_bind | false | 382 | 382 | (condition decl) | -| for_decl_bind | false | 384 | 384 | x | -| for_decl_bind | false | 386 | 386 | ++ ... | -| for_decl_bind | false | 388 | 388 | ExprStmt | -| for_decl_bind | false | 390 | 390 | { ... } | -| for_decl_bind | false | 392 | 392 | declaration | -| for_decl_bind | false | 394 | 394 | x | -| for_decl_bind | false | 398 | 398 | 2 | -| for_decl_bind | false | 399 | 399 | ... *= ... | -| for_decl_bind | false | 401 | 401 | for(...;...;...) ... | -| for_decl_bind | false | 403 | 403 | x | -| for_decl_bind | false | 405 | 405 | -- ... | -| for_decl_bind | false | 407 | 407 | ExprStmt | -| for_decl_bind | false | 409 | 409 | return ... | -| for_decl_bind | false | 411 | 411 | { ... } | -| for_decl_bind | false | 413 | 413 | init | -| for_decl_bind | false | 415 | 415 | call to init.~BoxedInt | -| for_decl_bind | false | 416 | 416 | bi | -| for_decl_bind | false | 418 | 418 | call to bi.~BoxedInt | -| for_decl_bind | false | 419 | 419 | bi | -| for_decl_bind | false | 420 | 420 | call to bi.~BoxedInt | -| for_decl_bind | true | 358 | 373 | | -| for_decl_bind | true | 360 | 362 | | -| for_decl_bind | true | 362 | 358 | | -| for_decl_bind | true | 364 | 360 | | -| for_decl_bind | true | 371 | 382 | | -| for_decl_bind | true | 373 | 371 | | -| for_decl_bind | true | 382 | 390 | T | -| for_decl_bind | true | 382 | 416 | F | -| for_decl_bind | true | 384 | 386 | | -| for_decl_bind | true | 386 | 394 | | -| for_decl_bind | true | 388 | 384 | | -| for_decl_bind | true | 390 | 388 | | -| for_decl_bind | true | 392 | 364 | | -| for_decl_bind | true | 394 | 398 | | -| for_decl_bind | true | 398 | 399 | | -| for_decl_bind | true | 399 | 419 | | -| for_decl_bind | true | 401 | 392 | | -| for_decl_bind | true | 403 | 405 | | -| for_decl_bind | true | 405 | 409 | | -| for_decl_bind | true | 407 | 403 | | -| for_decl_bind | true | 409 | 353 | | -| for_decl_bind | true | 411 | 401 | | -| for_decl_bind | true | 413 | 415 | | -| for_decl_bind | true | 415 | 407 | | -| for_decl_bind | true | 416 | 418 | | -| for_decl_bind | true | 418 | 413 | | -| for_decl_bind | true | 419 | 420 | | -| for_decl_bind | true | 420 | 373 | | -| for_loop_scope | false | 600 | 600 | for_loop_scope | -| for_loop_scope | false | 607 | 607 | declaration | -| for_loop_scope | false | 612 | 612 | x | -| for_loop_scope | false | 616 | 616 | 10 | -| for_loop_scope | false | 617 | 617 | ... < ... | -| for_loop_scope | false | 622 | 622 | declaration | -| for_loop_scope | false | 624 | 624 | { ... } | -| for_loop_scope | false | 626 | 626 | declaration | -| for_loop_scope | false | 628 | 628 | x | -| for_loop_scope | false | 630 | 630 | ++ ... | -| for_loop_scope | false | 632 | 632 | for(...;...;...) ... | -| for_loop_scope | false | 634 | 634 | return ... | -| for_loop_scope | false | 636 | 636 | { ... } | -| for_loop_scope | false | 638 | 638 | outer_scope | -| for_loop_scope | false | 640 | 640 | call to outer_scope.~NonTrivial | -| for_loop_scope | false | 641 | 641 | for_scope | -| for_loop_scope | false | 643 | 643 | call to for_scope.~NonTrivial | -| for_loop_scope | false | 644 | 644 | inner_scope | -| for_loop_scope | false | 646 | 646 | call to inner_scope.~NonTrivial | -| for_loop_scope | true | 607 | 632 | | -| for_loop_scope | true | 612 | 616 | | -| for_loop_scope | true | 616 | 617 | | -| for_loop_scope | true | 617 | 624 | T | -| for_loop_scope | true | 617 | 641 | F | -| for_loop_scope | true | 622 | 644 | | -| for_loop_scope | true | 624 | 622 | | -| for_loop_scope | true | 626 | 612 | | -| for_loop_scope | true | 628 | 630 | | -| for_loop_scope | true | 630 | 612 | | -| for_loop_scope | true | 632 | 626 | | -| for_loop_scope | true | 634 | 638 | | -| for_loop_scope | true | 636 | 607 | | -| for_loop_scope | true | 638 | 640 | | -| for_loop_scope | true | 640 | 600 | | -| for_loop_scope | true | 641 | 643 | | -| for_loop_scope | true | 643 | 634 | | -| for_loop_scope | true | 644 | 646 | | -| for_loop_scope | true | 646 | 628 | | -| gotos | false | 664 | 664 | gotos | -| gotos | false | 674 | 674 | declaration | -| gotos | false | 676 | 676 | x | -| gotos | false | 678 | 678 | (bool)... | -| gotos | false | 682 | 682 | goto ... | -| gotos | false | 684 | 684 | if (...) ... | -| gotos | false | 686 | 686 | x | -| gotos | false | 688 | 688 | ++ ... | -| gotos | false | 690 | 690 | initializer for y | -| gotos | false | 698 | 698 | declaration | -| gotos | false | 700 | 700 | label ...: | -| gotos | false | 702 | 702 | declaration | -| gotos | false | 704 | 704 | y | -| gotos | false | 706 | 706 | (bool)... | -| gotos | false | 710 | 710 | goto ... | -| gotos | false | 712 | 712 | if (...) ... | -| gotos | false | 714 | 714 | declaration | -| gotos | false | 716 | 716 | { ... } | -| gotos | false | 718 | 718 | label ...: | -| gotos | false | 720 | 720 | x | -| gotos | false | 722 | 722 | -- ... | -| gotos | false | 724 | 724 | ExprStmt | -| gotos | false | 726 | 726 | return ... | -| gotos | false | 728 | 728 | { ... } | -| gotos | false | 730 | 730 | nt1 | -| gotos | false | 732 | 732 | call to nt1.~NonTrivial | -| gotos | false | 733 | 733 | nt2 | -| gotos | false | 735 | 735 | call to nt2.~NonTrivial | -| gotos | false | 736 | 736 | nt3 | -| gotos | false | 737 | 737 | call to nt3.~NonTrivial | -| gotos | false | 738 | 738 | nt2 | -| gotos | false | 739 | 739 | call to nt2.~NonTrivial | -| gotos | true | 674 | 684 | | -| gotos | true | 676 | 682 | T | -| gotos | true | 676 | 716 | F | -| gotos | true | 682 | 700 | | -| gotos | true | 684 | 676 | | -| gotos | true | 686 | 688 | | -| gotos | true | 688 | 700 | | -| gotos | true | 690 | 686 | | -| gotos | true | 698 | 690 | | -| gotos | true | 698 | 700 | | -| gotos | true | 700 | 702 | | -| gotos | true | 702 | 712 | | -| gotos | true | 704 | 710 | T | -| gotos | true | 704 | 714 | F | -| gotos | true | 710 | 738 | | -| gotos | true | 712 | 704 | | -| gotos | true | 714 | 736 | | -| gotos | true | 716 | 698 | | -| gotos | true | 718 | 724 | | -| gotos | true | 720 | 722 | | -| gotos | true | 722 | 726 | | -| gotos | true | 724 | 720 | | -| gotos | true | 726 | 730 | | -| gotos | true | 728 | 674 | | -| gotos | true | 730 | 732 | | -| gotos | true | 732 | 664 | | -| gotos | true | 733 | 735 | | -| gotos | true | 735 | 718 | | -| gotos | true | 736 | 737 | | -| gotos | true | 737 | 733 | | -| gotos | true | 738 | 739 | | -| gotos | true | 739 | 718 | | -| if_decl_bind | false | 144 | 144 | if_decl_bind | -| if_decl_bind | false | 151 | 151 | call to operator int | -| if_decl_bind | false | 153 | 153 | call to BoxedInt | -| if_decl_bind | false | 155 | 155 | x | -| if_decl_bind | false | 157 | 157 | initializer for bi | -| if_decl_bind | false | 161 | 161 | bi | -| if_decl_bind | false | 163 | 163 | (bool)... | -| if_decl_bind | false | 164 | 164 | (condition decl) | -| if_decl_bind | false | 166 | 166 | bi | -| if_decl_bind | false | 168 | 168 | m_ptr | -| if_decl_bind | false | 170 | 170 | * ... | -| if_decl_bind | false | 172 | 172 | ++ ... | -| if_decl_bind | false | 174 | 174 | ExprStmt | -| if_decl_bind | false | 176 | 176 | { ... } | -| if_decl_bind | false | 178 | 178 | bi | -| if_decl_bind | false | 180 | 180 | m_ptr | -| if_decl_bind | false | 182 | 182 | * ... | -| if_decl_bind | false | 184 | 184 | -- ... | -| if_decl_bind | false | 186 | 186 | ExprStmt | -| if_decl_bind | false | 188 | 188 | { ... } | -| if_decl_bind | false | 190 | 190 | if (...) ... | -| if_decl_bind | false | 192 | 192 | x | -| if_decl_bind | false | 196 | 196 | 1 | -| if_decl_bind | false | 197 | 197 | ... = ... | -| if_decl_bind | false | 199 | 199 | ExprStmt | -| if_decl_bind | false | 201 | 201 | return ... | -| if_decl_bind | false | 203 | 203 | { ... } | -| if_decl_bind | false | 205 | 205 | bi | -| if_decl_bind | false | 207 | 207 | call to bi.~BoxedInt | -| if_decl_bind | true | 153 | 164 | | -| if_decl_bind | true | 155 | 153 | | -| if_decl_bind | true | 164 | 176 | T | -| if_decl_bind | true | 164 | 188 | F | -| if_decl_bind | true | 166 | 168 | | -| if_decl_bind | true | 168 | 170 | | -| if_decl_bind | true | 170 | 172 | | -| if_decl_bind | true | 172 | 205 | | -| if_decl_bind | true | 174 | 166 | | -| if_decl_bind | true | 176 | 174 | | -| if_decl_bind | true | 178 | 180 | | -| if_decl_bind | true | 180 | 182 | | -| if_decl_bind | true | 182 | 184 | | -| if_decl_bind | true | 184 | 205 | | -| if_decl_bind | true | 186 | 178 | | -| if_decl_bind | true | 188 | 186 | | -| if_decl_bind | true | 190 | 155 | | -| if_decl_bind | true | 192 | 197 | | -| if_decl_bind | true | 196 | 192 | | -| if_decl_bind | true | 197 | 201 | | -| if_decl_bind | true | 199 | 196 | | -| if_decl_bind | true | 201 | 144 | | -| if_decl_bind | true | 203 | 190 | | -| if_decl_bind | true | 205 | 207 | | -| if_decl_bind | true | 207 | 199 | | -| never_destructs | false | 648 | 648 | never_destructs | -| never_destructs | false | 654 | 654 | declaration | -| never_destructs | false | 656 | 656 | label ...: | -| never_destructs | false | 658 | 658 | goto ... | -| never_destructs | false | 660 | 660 | { ... } | -| never_destructs | true | 654 | 656 | | -| never_destructs | true | 656 | 658 | | -| never_destructs | true | 658 | 656 | | -| never_destructs | true | 660 | 654 | | -| operator delete | false | 97 | 97 | operator delete | -| operator new | false | 78 | 78 | operator new | -| simple | false | 464 | 464 | simple | -| simple | false | 471 | 471 | declaration | -| simple | false | 473 | 473 | return ... | -| simple | false | 475 | 475 | { ... } | -| simple | false | 477 | 477 | nt | -| simple | false | 479 | 479 | call to nt.~NonTrivial | -| simple | true | 471 | 473 | | -| simple | true | 473 | 477 | | -| simple | true | 475 | 471 | | -| simple | true | 477 | 479 | | -| simple | true | 479 | 464 | | -| simple2 | false | 482 | 482 | simple2 | -| simple2 | false | 488 | 488 | declaration | -| simple2 | false | 493 | 493 | declaration | -| simple2 | false | 495 | 495 | return ... | -| simple2 | false | 497 | 497 | { ... } | -| simple2 | false | 499 | 499 | one | -| simple2 | false | 501 | 501 | call to one.~NonTrivial | -| simple2 | false | 502 | 502 | two | -| simple2 | false | 503 | 503 | call to two.~NonTrivial | -| simple2 | true | 488 | 493 | | -| simple2 | true | 493 | 495 | | -| simple2 | true | 495 | 502 | | -| simple2 | true | 497 | 488 | | -| simple2 | true | 499 | 501 | | -| simple2 | true | 501 | 482 | | -| simple2 | true | 502 | 503 | | -| simple2 | true | 503 | 499 | | -| switch_decl_bind | false | 210 | 210 | switch_decl_bind | -| switch_decl_bind | false | 215 | 215 | call to operator int | -| switch_decl_bind | false | 217 | 217 | call to BoxedInt | -| switch_decl_bind | false | 219 | 219 | x | -| switch_decl_bind | false | 221 | 221 | initializer for bi | -| switch_decl_bind | false | 225 | 225 | bi | -| switch_decl_bind | false | 227 | 227 | (condition decl) | -| switch_decl_bind | false | 231 | 231 | 0 | -| switch_decl_bind | false | 232 | 232 | case ...: | -| switch_decl_bind | false | 234 | 234 | bi | -| switch_decl_bind | false | 236 | 236 | m_ptr | -| switch_decl_bind | false | 238 | 238 | * ... | -| switch_decl_bind | false | 240 | 240 | -- ... | -| switch_decl_bind | false | 242 | 242 | ExprStmt | -| switch_decl_bind | false | 244 | 244 | break; | -| switch_decl_bind | false | 248 | 248 | 1 | -| switch_decl_bind | false | 249 | 249 | case ...: | -| switch_decl_bind | false | 251 | 251 | bi | -| switch_decl_bind | false | 253 | 253 | m_ptr | -| switch_decl_bind | false | 255 | 255 | * ... | -| switch_decl_bind | false | 257 | 257 | ++ ... | -| switch_decl_bind | false | 259 | 259 | ExprStmt | -| switch_decl_bind | false | 261 | 261 | break; | -| switch_decl_bind | false | 263 | 263 | default: | -| switch_decl_bind | false | 265 | 265 | bi | -| switch_decl_bind | false | 267 | 267 | m_ptr | -| switch_decl_bind | false | 269 | 269 | * ... | -| switch_decl_bind | false | 273 | 273 | 2 | -| switch_decl_bind | false | 274 | 274 | ... /= ... | -| switch_decl_bind | false | 276 | 276 | ExprStmt | -| switch_decl_bind | false | 278 | 278 | { ... } | -| switch_decl_bind | false | 280 | 280 | switch (...) ... | -| switch_decl_bind | false | 282 | 282 | label ...: | -| switch_decl_bind | false | 284 | 284 | x | -| switch_decl_bind | false | 288 | 288 | 1 | -| switch_decl_bind | false | 289 | 289 | ... = ... | -| switch_decl_bind | false | 291 | 291 | ExprStmt | -| switch_decl_bind | false | 293 | 293 | return ... | -| switch_decl_bind | false | 295 | 295 | { ... } | -| switch_decl_bind | false | 297 | 297 | bi | -| switch_decl_bind | false | 299 | 299 | call to bi.~BoxedInt | -| switch_decl_bind | false | 300 | 300 | bi | -| switch_decl_bind | false | 301 | 301 | call to bi.~BoxedInt | -| switch_decl_bind | false | 302 | 302 | bi | -| switch_decl_bind | false | 303 | 303 | call to bi.~BoxedInt | -| switch_decl_bind | true | 217 | 227 | | -| switch_decl_bind | true | 219 | 217 | | -| switch_decl_bind | true | 227 | 278 | | -| switch_decl_bind | true | 232 | 242 | | -| switch_decl_bind | true | 234 | 236 | | -| switch_decl_bind | true | 236 | 238 | | -| switch_decl_bind | true | 238 | 240 | | -| switch_decl_bind | true | 240 | 244 | | -| switch_decl_bind | true | 242 | 234 | | -| switch_decl_bind | true | 244 | 302 | | -| switch_decl_bind | true | 249 | 259 | | -| switch_decl_bind | true | 251 | 253 | | -| switch_decl_bind | true | 253 | 255 | | -| switch_decl_bind | true | 255 | 257 | | -| switch_decl_bind | true | 257 | 261 | | -| switch_decl_bind | true | 259 | 251 | | -| switch_decl_bind | true | 261 | 300 | | -| switch_decl_bind | true | 263 | 276 | | -| switch_decl_bind | true | 265 | 267 | | -| switch_decl_bind | true | 267 | 269 | | -| switch_decl_bind | true | 269 | 273 | | -| switch_decl_bind | true | 273 | 274 | | -| switch_decl_bind | true | 274 | 297 | | -| switch_decl_bind | true | 276 | 265 | | -| switch_decl_bind | true | 278 | 232 | | -| switch_decl_bind | true | 278 | 249 | | -| switch_decl_bind | true | 278 | 263 | | -| switch_decl_bind | true | 280 | 219 | | -| switch_decl_bind | true | 282 | 291 | | -| switch_decl_bind | true | 284 | 289 | | -| switch_decl_bind | true | 288 | 284 | | -| switch_decl_bind | true | 289 | 293 | | -| switch_decl_bind | true | 291 | 288 | | -| switch_decl_bind | true | 293 | 210 | | -| switch_decl_bind | true | 295 | 280 | | -| switch_decl_bind | true | 297 | 299 | | -| switch_decl_bind | true | 299 | 282 | | -| switch_decl_bind | true | 300 | 301 | | -| switch_decl_bind | true | 301 | 282 | | -| switch_decl_bind | true | 302 | 303 | | -| switch_decl_bind | true | 303 | 282 | | -| while_decl_bind | false | 306 | 306 | while_decl_bind | -| while_decl_bind | false | 311 | 311 | call to operator int | -| while_decl_bind | false | 313 | 313 | call to BoxedInt | -| while_decl_bind | false | 315 | 315 | x | -| while_decl_bind | false | 317 | 317 | initializer for bi | -| while_decl_bind | false | 321 | 321 | bi | -| while_decl_bind | false | 323 | 323 | (bool)... | -| while_decl_bind | false | 324 | 324 | (condition decl) | -| while_decl_bind | false | 326 | 326 | x | -| while_decl_bind | false | 328 | 328 | -- ... | -| while_decl_bind | false | 330 | 330 | ExprStmt | -| while_decl_bind | false | 332 | 332 | { ... } | -| while_decl_bind | false | 334 | 334 | while (...) ... | -| while_decl_bind | false | 336 | 336 | x | -| while_decl_bind | false | 338 | 338 | ++ ... | -| while_decl_bind | false | 340 | 340 | ExprStmt | -| while_decl_bind | false | 342 | 342 | return ... | -| while_decl_bind | false | 344 | 344 | { ... } | -| while_decl_bind | false | 346 | 346 | bi | -| while_decl_bind | false | 348 | 348 | call to bi.~BoxedInt | -| while_decl_bind | false | 349 | 349 | bi | -| while_decl_bind | false | 350 | 350 | call to bi.~BoxedInt | -| while_decl_bind | true | 313 | 324 | | -| while_decl_bind | true | 315 | 313 | | -| while_decl_bind | true | 324 | 332 | T | -| while_decl_bind | true | 324 | 346 | F | -| while_decl_bind | true | 326 | 328 | | -| while_decl_bind | true | 328 | 349 | | -| while_decl_bind | true | 330 | 326 | | -| while_decl_bind | true | 332 | 330 | | -| while_decl_bind | true | 334 | 315 | | -| while_decl_bind | true | 336 | 338 | | -| while_decl_bind | true | 338 | 342 | | -| while_decl_bind | true | 340 | 336 | | -| while_decl_bind | true | 342 | 306 | | -| while_decl_bind | true | 344 | 334 | | -| while_decl_bind | true | 346 | 348 | | -| while_decl_bind | true | 348 | 340 | | -| while_decl_bind | true | 349 | 350 | | -| while_decl_bind | true | 350 | 315 | | +| BoxedInt::BoxedInt | false | 197 | 197 | BoxedInt | +| BoxedInt::BoxedInt | false | 485 | 485 | BoxedInt | +| BoxedInt::BoxedInt | false | 528 | 528 | this | +| BoxedInt::BoxedInt | false | 529 | 529 | m_ptr | +| BoxedInt::BoxedInt | false | 533 | 533 | x | +| BoxedInt::BoxedInt | false | 535 | 535 | new | +| BoxedInt::BoxedInt | false | 537 | 537 | ... = ... | +| BoxedInt::BoxedInt | false | 539 | 539 | ExprStmt | +| BoxedInt::BoxedInt | false | 541 | 541 | return ... | +| BoxedInt::BoxedInt | false | 543 | 543 | { ... } | +| BoxedInt::BoxedInt | true | 528 | 529 | | +| BoxedInt::BoxedInt | true | 529 | 537 | | +| BoxedInt::BoxedInt | true | 533 | 535 | | +| BoxedInt::BoxedInt | true | 535 | 528 | | +| BoxedInt::BoxedInt | true | 537 | 541 | | +| BoxedInt::BoxedInt | true | 539 | 533 | | +| BoxedInt::BoxedInt | true | 541 | 197 | | +| BoxedInt::BoxedInt | true | 543 | 539 | | +| BoxedInt::operator int | false | 205 | 205 | operator int | +| BoxedInt::operator int | false | 495 | 495 | this | +| BoxedInt::operator int | false | 496 | 496 | m_ptr | +| BoxedInt::operator int | false | 498 | 498 | * ... | +| BoxedInt::operator int | false | 500 | 500 | return ... | +| BoxedInt::operator int | false | 502 | 502 | { ... } | +| BoxedInt::operator int | true | 495 | 496 | | +| BoxedInt::operator int | true | 496 | 498 | | +| BoxedInt::operator int | true | 498 | 205 | | +| BoxedInt::operator int | true | 500 | 495 | | +| BoxedInt::operator int | true | 502 | 500 | | +| BoxedInt::operator= | false | 478 | 478 | operator= | +| BoxedInt::~BoxedInt | false | 255 | 255 | ~BoxedInt | +| BoxedInt::~BoxedInt | false | 510 | 510 | this | +| BoxedInt::~BoxedInt | false | 511 | 511 | m_ptr | +| BoxedInt::~BoxedInt | false | 513 | 513 | delete | +| BoxedInt::~BoxedInt | false | 515 | 515 | ExprStmt | +| BoxedInt::~BoxedInt | false | 517 | 517 | return ... | +| BoxedInt::~BoxedInt | false | 519 | 519 | { ... } | +| BoxedInt::~BoxedInt | true | 510 | 511 | | +| BoxedInt::~BoxedInt | true | 511 | 513 | | +| BoxedInt::~BoxedInt | true | 513 | 517 | | +| BoxedInt::~BoxedInt | true | 515 | 510 | | +| BoxedInt::~BoxedInt | true | 517 | 255 | | +| BoxedInt::~BoxedInt | true | 519 | 515 | | +| NonTrivial::operator= | false | 875 | 875 | operator= | +| NonTrivial::~NonTrivial | false | 650 | 650 | ~NonTrivial | +| NonTrivial::~NonTrivial | false | 886 | 886 | return ... | +| NonTrivial::~NonTrivial | false | 888 | 888 | { ... } | +| NonTrivial::~NonTrivial | true | 886 | 650 | | +| NonTrivial::~NonTrivial | true | 888 | 886 | | +| early_return | false | 778 | 778 | early_return | +| early_return | false | 786 | 786 | declaration | +| early_return | false | 788 | 788 | x | +| early_return | false | 790 | 790 | (bool)... | +| early_return | false | 794 | 794 | declaration | +| early_return | false | 796 | 796 | return ... | +| early_return | false | 798 | 798 | { ... } | +| early_return | false | 800 | 800 | if (...) ... | +| early_return | false | 802 | 802 | declaration | +| early_return | false | 804 | 804 | return ... | +| early_return | false | 806 | 806 | { ... } | +| early_return | false | 808 | 808 | before | +| early_return | false | 810 | 810 | call to before.~NonTrivial | +| early_return | false | 811 | 811 | after | +| early_return | false | 812 | 812 | call to after.~NonTrivial | +| early_return | false | 813 | 813 | inner | +| early_return | false | 815 | 815 | call to inner.~NonTrivial | +| early_return | false | 816 | 816 | inner | +| early_return | false | 817 | 817 | call to inner.~NonTrivial | +| early_return | true | 786 | 800 | | +| early_return | true | 788 | 798 | T | +| early_return | true | 788 | 802 | F | +| early_return | true | 794 | 796 | | +| early_return | true | 796 | 816 | | +| early_return | true | 798 | 794 | | +| early_return | true | 800 | 788 | | +| early_return | true | 802 | 804 | | +| early_return | true | 804 | 811 | | +| early_return | true | 806 | 786 | | +| early_return | true | 808 | 810 | | +| early_return | true | 810 | 778 | | +| early_return | true | 811 | 812 | | +| early_return | true | 812 | 808 | | +| early_return | true | 813 | 815 | | +| early_return | true | 815 | 802 | | +| early_return | true | 816 | 817 | | +| early_return | true | 817 | 808 | | +| early_throw | false | 728 | 728 | early_throw | +| early_throw | false | 736 | 736 | declaration | +| early_throw | false | 738 | 738 | x | +| early_throw | false | 740 | 740 | (bool)... | +| early_throw | false | 744 | 744 | declaration | +| early_throw | false | 746 | 746 | re-throw exception | +| early_throw | false | 748 | 748 | ExprStmt | +| early_throw | false | 750 | 750 | { ... } | +| early_throw | false | 752 | 752 | if (...) ... | +| early_throw | false | 754 | 754 | declaration | +| early_throw | false | 756 | 756 | return ... | +| early_throw | false | 758 | 758 | { ... } | +| early_throw | false | 760 | 760 | before | +| early_throw | false | 762 | 762 | call to before.~NonTrivial | +| early_throw | false | 763 | 763 | after | +| early_throw | false | 764 | 764 | call to after.~NonTrivial | +| early_throw | false | 765 | 765 | inner | +| early_throw | false | 767 | 767 | call to inner.~NonTrivial | +| early_throw | false | 768 | 768 | before | +| early_throw | false | 769 | 769 | call to before.~NonTrivial | +| early_throw | false | 770 | 770 | inner | +| early_throw | false | 771 | 771 | call to inner.~NonTrivial | +| early_throw | true | 736 | 752 | | +| early_throw | true | 738 | 750 | T | +| early_throw | true | 738 | 754 | F | +| early_throw | true | 744 | 748 | | +| early_throw | true | 746 | 770 | | +| early_throw | true | 748 | 746 | | +| early_throw | true | 750 | 744 | | +| early_throw | true | 752 | 738 | | +| early_throw | true | 754 | 756 | | +| early_throw | true | 756 | 763 | | +| early_throw | true | 758 | 736 | | +| early_throw | true | 760 | 762 | | +| early_throw | true | 762 | 728 | | +| early_throw | true | 763 | 764 | | +| early_throw | true | 764 | 760 | | +| early_throw | true | 765 | 767 | | +| early_throw | true | 767 | 754 | | +| early_throw | true | 768 | 769 | | +| early_throw | true | 769 | 728 | | +| early_throw | true | 770 | 771 | | +| early_throw | true | 771 | 768 | | +| for_decl_bind | false | 186 | 186 | for_decl_bind | +| for_decl_bind | false | 195 | 195 | call to BoxedInt | +| for_decl_bind | false | 198 | 198 | x | +| for_decl_bind | false | 200 | 200 | - ... | +| for_decl_bind | false | 202 | 202 | initializer for init | +| for_decl_bind | false | 209 | 209 | call to operator int | +| for_decl_bind | false | 211 | 211 | call to BoxedInt | +| for_decl_bind | false | 213 | 213 | x | +| for_decl_bind | false | 215 | 215 | initializer for bi | +| for_decl_bind | false | 218 | 218 | bi | +| for_decl_bind | false | 220 | 220 | (bool)... | +| for_decl_bind | false | 221 | 221 | (condition decl) | +| for_decl_bind | false | 223 | 223 | x | +| for_decl_bind | false | 225 | 225 | ++ ... | +| for_decl_bind | false | 227 | 227 | ExprStmt | +| for_decl_bind | false | 229 | 229 | { ... } | +| for_decl_bind | false | 231 | 231 | declaration | +| for_decl_bind | false | 233 | 233 | x | +| for_decl_bind | false | 237 | 237 | 2 | +| for_decl_bind | false | 238 | 238 | ... *= ... | +| for_decl_bind | false | 240 | 240 | for(...;...;...) ... | +| for_decl_bind | false | 242 | 242 | x | +| for_decl_bind | false | 244 | 244 | -- ... | +| for_decl_bind | false | 246 | 246 | ExprStmt | +| for_decl_bind | false | 248 | 248 | return ... | +| for_decl_bind | false | 250 | 250 | { ... } | +| for_decl_bind | false | 252 | 252 | init | +| for_decl_bind | false | 254 | 254 | call to init.~BoxedInt | +| for_decl_bind | false | 256 | 256 | bi | +| for_decl_bind | false | 258 | 258 | call to bi.~BoxedInt | +| for_decl_bind | false | 259 | 259 | bi | +| for_decl_bind | false | 260 | 260 | call to bi.~BoxedInt | +| for_decl_bind | true | 195 | 213 | | +| for_decl_bind | true | 198 | 200 | | +| for_decl_bind | true | 200 | 195 | | +| for_decl_bind | true | 202 | 198 | | +| for_decl_bind | true | 211 | 221 | | +| for_decl_bind | true | 213 | 211 | | +| for_decl_bind | true | 221 | 229 | T | +| for_decl_bind | true | 221 | 256 | F | +| for_decl_bind | true | 223 | 225 | | +| for_decl_bind | true | 225 | 233 | | +| for_decl_bind | true | 227 | 223 | | +| for_decl_bind | true | 229 | 227 | | +| for_decl_bind | true | 231 | 202 | | +| for_decl_bind | true | 233 | 237 | | +| for_decl_bind | true | 237 | 238 | | +| for_decl_bind | true | 238 | 259 | | +| for_decl_bind | true | 240 | 231 | | +| for_decl_bind | true | 242 | 244 | | +| for_decl_bind | true | 244 | 248 | | +| for_decl_bind | true | 246 | 242 | | +| for_decl_bind | true | 248 | 186 | | +| for_decl_bind | true | 250 | 240 | | +| for_decl_bind | true | 252 | 254 | | +| for_decl_bind | true | 254 | 246 | | +| for_decl_bind | true | 256 | 258 | | +| for_decl_bind | true | 258 | 252 | | +| for_decl_bind | true | 259 | 260 | | +| for_decl_bind | true | 260 | 213 | | +| for_loop_scope | false | 677 | 677 | for_loop_scope | +| for_loop_scope | false | 685 | 685 | declaration | +| for_loop_scope | false | 690 | 690 | x | +| for_loop_scope | false | 694 | 694 | 10 | +| for_loop_scope | false | 695 | 695 | ... < ... | +| for_loop_scope | false | 700 | 700 | declaration | +| for_loop_scope | false | 702 | 702 | { ... } | +| for_loop_scope | false | 704 | 704 | declaration | +| for_loop_scope | false | 706 | 706 | x | +| for_loop_scope | false | 708 | 708 | ++ ... | +| for_loop_scope | false | 710 | 710 | for(...;...;...) ... | +| for_loop_scope | false | 712 | 712 | return ... | +| for_loop_scope | false | 714 | 714 | { ... } | +| for_loop_scope | false | 716 | 716 | outer_scope | +| for_loop_scope | false | 718 | 718 | call to outer_scope.~NonTrivial | +| for_loop_scope | false | 719 | 719 | for_scope | +| for_loop_scope | false | 721 | 721 | call to for_scope.~NonTrivial | +| for_loop_scope | false | 722 | 722 | inner_scope | +| for_loop_scope | false | 724 | 724 | call to inner_scope.~NonTrivial | +| for_loop_scope | true | 685 | 710 | | +| for_loop_scope | true | 690 | 694 | | +| for_loop_scope | true | 694 | 695 | | +| for_loop_scope | true | 695 | 702 | T | +| for_loop_scope | true | 695 | 719 | F | +| for_loop_scope | true | 700 | 722 | | +| for_loop_scope | true | 702 | 700 | | +| for_loop_scope | true | 704 | 690 | | +| for_loop_scope | true | 706 | 708 | | +| for_loop_scope | true | 708 | 690 | | +| for_loop_scope | true | 710 | 704 | | +| for_loop_scope | true | 712 | 716 | | +| for_loop_scope | true | 714 | 685 | | +| for_loop_scope | true | 716 | 718 | | +| for_loop_scope | true | 718 | 677 | | +| for_loop_scope | true | 719 | 721 | | +| for_loop_scope | true | 721 | 712 | | +| for_loop_scope | true | 722 | 724 | | +| for_loop_scope | true | 724 | 706 | | +| gotos | false | 586 | 586 | gotos | +| gotos | false | 594 | 594 | declaration | +| gotos | false | 596 | 596 | x | +| gotos | false | 598 | 598 | (bool)... | +| gotos | false | 599 | 599 | goto ... | +| gotos | false | 601 | 601 | if (...) ... | +| gotos | false | 603 | 603 | x | +| gotos | false | 605 | 605 | ++ ... | +| gotos | false | 607 | 607 | initializer for y | +| gotos | false | 618 | 618 | declaration | +| gotos | false | 620 | 620 | label ...: | +| gotos | false | 622 | 622 | declaration | +| gotos | false | 624 | 624 | y | +| gotos | false | 626 | 626 | (bool)... | +| gotos | false | 627 | 627 | goto ... | +| gotos | false | 629 | 629 | if (...) ... | +| gotos | false | 631 | 631 | declaration | +| gotos | false | 633 | 633 | { ... } | +| gotos | false | 635 | 635 | label ...: | +| gotos | false | 637 | 637 | x | +| gotos | false | 639 | 639 | -- ... | +| gotos | false | 641 | 641 | ExprStmt | +| gotos | false | 643 | 643 | return ... | +| gotos | false | 645 | 645 | { ... } | +| gotos | false | 647 | 647 | nt1 | +| gotos | false | 649 | 649 | call to nt1.~NonTrivial | +| gotos | false | 651 | 651 | nt2 | +| gotos | false | 653 | 653 | call to nt2.~NonTrivial | +| gotos | false | 654 | 654 | nt3 | +| gotos | false | 655 | 655 | call to nt3.~NonTrivial | +| gotos | false | 656 | 656 | nt2 | +| gotos | false | 657 | 657 | call to nt2.~NonTrivial | +| gotos | true | 594 | 601 | | +| gotos | true | 596 | 599 | T | +| gotos | true | 596 | 633 | F | +| gotos | true | 599 | 620 | | +| gotos | true | 601 | 596 | | +| gotos | true | 603 | 605 | | +| gotos | true | 605 | 620 | | +| gotos | true | 607 | 603 | | +| gotos | true | 618 | 607 | | +| gotos | true | 618 | 620 | | +| gotos | true | 620 | 622 | | +| gotos | true | 622 | 629 | | +| gotos | true | 624 | 627 | T | +| gotos | true | 624 | 631 | F | +| gotos | true | 627 | 656 | | +| gotos | true | 629 | 624 | | +| gotos | true | 631 | 654 | | +| gotos | true | 633 | 618 | | +| gotos | true | 635 | 641 | | +| gotos | true | 637 | 639 | | +| gotos | true | 639 | 643 | | +| gotos | true | 641 | 637 | | +| gotos | true | 643 | 647 | | +| gotos | true | 645 | 594 | | +| gotos | true | 647 | 649 | | +| gotos | true | 649 | 586 | | +| gotos | true | 651 | 653 | | +| gotos | true | 653 | 635 | | +| gotos | true | 654 | 655 | | +| gotos | true | 655 | 651 | | +| gotos | true | 656 | 657 | | +| gotos | true | 657 | 635 | | +| if_decl_bind | false | 408 | 408 | if_decl_bind | +| if_decl_bind | false | 417 | 417 | call to operator int | +| if_decl_bind | false | 419 | 419 | call to BoxedInt | +| if_decl_bind | false | 421 | 421 | x | +| if_decl_bind | false | 423 | 423 | initializer for bi | +| if_decl_bind | false | 426 | 426 | bi | +| if_decl_bind | false | 428 | 428 | (bool)... | +| if_decl_bind | false | 429 | 429 | (condition decl) | +| if_decl_bind | false | 431 | 431 | bi | +| if_decl_bind | false | 433 | 433 | m_ptr | +| if_decl_bind | false | 435 | 435 | * ... | +| if_decl_bind | false | 437 | 437 | ++ ... | +| if_decl_bind | false | 439 | 439 | ExprStmt | +| if_decl_bind | false | 441 | 441 | { ... } | +| if_decl_bind | false | 443 | 443 | bi | +| if_decl_bind | false | 445 | 445 | m_ptr | +| if_decl_bind | false | 447 | 447 | * ... | +| if_decl_bind | false | 449 | 449 | -- ... | +| if_decl_bind | false | 451 | 451 | ExprStmt | +| if_decl_bind | false | 453 | 453 | { ... } | +| if_decl_bind | false | 455 | 455 | if (...) ... | +| if_decl_bind | false | 457 | 457 | x | +| if_decl_bind | false | 461 | 461 | 1 | +| if_decl_bind | false | 462 | 462 | ... = ... | +| if_decl_bind | false | 464 | 464 | ExprStmt | +| if_decl_bind | false | 466 | 466 | return ... | +| if_decl_bind | false | 468 | 468 | { ... } | +| if_decl_bind | false | 470 | 470 | bi | +| if_decl_bind | false | 472 | 472 | call to bi.~BoxedInt | +| if_decl_bind | true | 419 | 429 | | +| if_decl_bind | true | 421 | 419 | | +| if_decl_bind | true | 429 | 441 | T | +| if_decl_bind | true | 429 | 453 | F | +| if_decl_bind | true | 431 | 433 | | +| if_decl_bind | true | 433 | 435 | | +| if_decl_bind | true | 435 | 437 | | +| if_decl_bind | true | 437 | 470 | | +| if_decl_bind | true | 439 | 431 | | +| if_decl_bind | true | 441 | 439 | | +| if_decl_bind | true | 443 | 445 | | +| if_decl_bind | true | 445 | 447 | | +| if_decl_bind | true | 447 | 449 | | +| if_decl_bind | true | 449 | 470 | | +| if_decl_bind | true | 451 | 443 | | +| if_decl_bind | true | 453 | 451 | | +| if_decl_bind | true | 455 | 421 | | +| if_decl_bind | true | 457 | 462 | | +| if_decl_bind | true | 461 | 457 | | +| if_decl_bind | true | 462 | 466 | | +| if_decl_bind | true | 464 | 461 | | +| if_decl_bind | true | 466 | 408 | | +| if_decl_bind | true | 468 | 455 | | +| if_decl_bind | true | 470 | 472 | | +| if_decl_bind | true | 472 | 464 | | +| never_destructs | false | 661 | 661 | never_destructs | +| never_destructs | false | 666 | 666 | declaration | +| never_destructs | false | 668 | 668 | label ...: | +| never_destructs | false | 670 | 670 | goto ... | +| never_destructs | false | 672 | 672 | { ... } | +| never_destructs | true | 666 | 668 | | +| never_destructs | true | 668 | 670 | | +| never_destructs | true | 670 | 668 | | +| never_destructs | true | 672 | 666 | | +| operator delete | false | 508 | 508 | operator delete | +| operator new | false | 531 | 531 | operator new | +| operator= | false | 95 | 95 | operator= | +| operator= | false | 102 | 102 | operator= | +| simple | false | 848 | 848 | simple | +| simple | false | 853 | 853 | declaration | +| simple | false | 855 | 855 | return ... | +| simple | false | 857 | 857 | { ... } | +| simple | false | 859 | 859 | nt | +| simple | false | 861 | 861 | call to nt.~NonTrivial | +| simple | true | 853 | 855 | | +| simple | true | 855 | 859 | | +| simple | true | 857 | 853 | | +| simple | true | 859 | 861 | | +| simple | true | 861 | 848 | | +| simple2 | false | 824 | 824 | simple2 | +| simple2 | false | 829 | 829 | declaration | +| simple2 | false | 831 | 831 | declaration | +| simple2 | false | 833 | 833 | return ... | +| simple2 | false | 835 | 835 | { ... } | +| simple2 | false | 837 | 837 | one | +| simple2 | false | 839 | 839 | call to one.~NonTrivial | +| simple2 | false | 840 | 840 | two | +| simple2 | false | 841 | 841 | call to two.~NonTrivial | +| simple2 | true | 829 | 831 | | +| simple2 | true | 831 | 833 | | +| simple2 | true | 833 | 840 | | +| simple2 | true | 835 | 829 | | +| simple2 | true | 837 | 839 | | +| simple2 | true | 839 | 824 | | +| simple2 | true | 840 | 841 | | +| simple2 | true | 841 | 837 | | +| switch_decl_bind | false | 309 | 309 | switch_decl_bind | +| switch_decl_bind | false | 318 | 318 | call to operator int | +| switch_decl_bind | false | 320 | 320 | call to BoxedInt | +| switch_decl_bind | false | 322 | 322 | x | +| switch_decl_bind | false | 324 | 324 | initializer for bi | +| switch_decl_bind | false | 327 | 327 | bi | +| switch_decl_bind | false | 329 | 329 | (condition decl) | +| switch_decl_bind | false | 333 | 333 | 0 | +| switch_decl_bind | false | 334 | 334 | case ...: | +| switch_decl_bind | false | 337 | 337 | bi | +| switch_decl_bind | false | 340 | 340 | m_ptr | +| switch_decl_bind | false | 342 | 342 | * ... | +| switch_decl_bind | false | 344 | 344 | -- ... | +| switch_decl_bind | false | 346 | 346 | ExprStmt | +| switch_decl_bind | false | 348 | 348 | break; | +| switch_decl_bind | false | 352 | 352 | 1 | +| switch_decl_bind | false | 353 | 353 | case ...: | +| switch_decl_bind | false | 355 | 355 | bi | +| switch_decl_bind | false | 357 | 357 | m_ptr | +| switch_decl_bind | false | 359 | 359 | * ... | +| switch_decl_bind | false | 361 | 361 | ++ ... | +| switch_decl_bind | false | 363 | 363 | ExprStmt | +| switch_decl_bind | false | 365 | 365 | break; | +| switch_decl_bind | false | 367 | 367 | default: | +| switch_decl_bind | false | 369 | 369 | bi | +| switch_decl_bind | false | 371 | 371 | m_ptr | +| switch_decl_bind | false | 373 | 373 | * ... | +| switch_decl_bind | false | 377 | 377 | 2 | +| switch_decl_bind | false | 378 | 378 | ... /= ... | +| switch_decl_bind | false | 380 | 380 | ExprStmt | +| switch_decl_bind | false | 382 | 382 | { ... } | +| switch_decl_bind | false | 384 | 384 | switch (...) ... | +| switch_decl_bind | false | 386 | 386 | label ...: | +| switch_decl_bind | false | 388 | 388 | x | +| switch_decl_bind | false | 392 | 392 | 1 | +| switch_decl_bind | false | 393 | 393 | ... = ... | +| switch_decl_bind | false | 395 | 395 | ExprStmt | +| switch_decl_bind | false | 397 | 397 | return ... | +| switch_decl_bind | false | 399 | 399 | { ... } | +| switch_decl_bind | false | 401 | 401 | bi | +| switch_decl_bind | false | 403 | 403 | call to bi.~BoxedInt | +| switch_decl_bind | false | 404 | 404 | bi | +| switch_decl_bind | false | 405 | 405 | call to bi.~BoxedInt | +| switch_decl_bind | false | 406 | 406 | bi | +| switch_decl_bind | false | 407 | 407 | call to bi.~BoxedInt | +| switch_decl_bind | true | 320 | 329 | | +| switch_decl_bind | true | 322 | 320 | | +| switch_decl_bind | true | 329 | 382 | | +| switch_decl_bind | true | 334 | 346 | | +| switch_decl_bind | true | 337 | 340 | | +| switch_decl_bind | true | 340 | 342 | | +| switch_decl_bind | true | 342 | 344 | | +| switch_decl_bind | true | 344 | 348 | | +| switch_decl_bind | true | 346 | 337 | | +| switch_decl_bind | true | 348 | 406 | | +| switch_decl_bind | true | 353 | 363 | | +| switch_decl_bind | true | 355 | 357 | | +| switch_decl_bind | true | 357 | 359 | | +| switch_decl_bind | true | 359 | 361 | | +| switch_decl_bind | true | 361 | 365 | | +| switch_decl_bind | true | 363 | 355 | | +| switch_decl_bind | true | 365 | 404 | | +| switch_decl_bind | true | 367 | 380 | | +| switch_decl_bind | true | 369 | 371 | | +| switch_decl_bind | true | 371 | 373 | | +| switch_decl_bind | true | 373 | 377 | | +| switch_decl_bind | true | 377 | 378 | | +| switch_decl_bind | true | 378 | 401 | | +| switch_decl_bind | true | 380 | 369 | | +| switch_decl_bind | true | 382 | 334 | | +| switch_decl_bind | true | 382 | 353 | | +| switch_decl_bind | true | 382 | 367 | | +| switch_decl_bind | true | 384 | 322 | | +| switch_decl_bind | true | 386 | 395 | | +| switch_decl_bind | true | 388 | 393 | | +| switch_decl_bind | true | 392 | 388 | | +| switch_decl_bind | true | 393 | 397 | | +| switch_decl_bind | true | 395 | 392 | | +| switch_decl_bind | true | 397 | 309 | | +| switch_decl_bind | true | 399 | 384 | | +| switch_decl_bind | true | 401 | 403 | | +| switch_decl_bind | true | 403 | 386 | | +| switch_decl_bind | true | 404 | 405 | | +| switch_decl_bind | true | 405 | 386 | | +| switch_decl_bind | true | 406 | 407 | | +| switch_decl_bind | true | 407 | 386 | | +| while_decl_bind | false | 261 | 261 | while_decl_bind | +| while_decl_bind | false | 270 | 270 | call to operator int | +| while_decl_bind | false | 272 | 272 | call to BoxedInt | +| while_decl_bind | false | 274 | 274 | x | +| while_decl_bind | false | 276 | 276 | initializer for bi | +| while_decl_bind | false | 279 | 279 | bi | +| while_decl_bind | false | 281 | 281 | (bool)... | +| while_decl_bind | false | 282 | 282 | (condition decl) | +| while_decl_bind | false | 284 | 284 | x | +| while_decl_bind | false | 286 | 286 | -- ... | +| while_decl_bind | false | 288 | 288 | ExprStmt | +| while_decl_bind | false | 290 | 290 | { ... } | +| while_decl_bind | false | 292 | 292 | while (...) ... | +| while_decl_bind | false | 294 | 294 | x | +| while_decl_bind | false | 296 | 296 | ++ ... | +| while_decl_bind | false | 298 | 298 | ExprStmt | +| while_decl_bind | false | 300 | 300 | return ... | +| while_decl_bind | false | 302 | 302 | { ... } | +| while_decl_bind | false | 304 | 304 | bi | +| while_decl_bind | false | 306 | 306 | call to bi.~BoxedInt | +| while_decl_bind | false | 307 | 307 | bi | +| while_decl_bind | false | 308 | 308 | call to bi.~BoxedInt | +| while_decl_bind | true | 272 | 282 | | +| while_decl_bind | true | 274 | 272 | | +| while_decl_bind | true | 282 | 290 | T | +| while_decl_bind | true | 282 | 304 | F | +| while_decl_bind | true | 284 | 286 | | +| while_decl_bind | true | 286 | 307 | | +| while_decl_bind | true | 288 | 284 | | +| while_decl_bind | true | 290 | 288 | | +| while_decl_bind | true | 292 | 274 | | +| while_decl_bind | true | 294 | 296 | | +| while_decl_bind | true | 296 | 300 | | +| while_decl_bind | true | 298 | 294 | | +| while_decl_bind | true | 300 | 261 | | +| while_decl_bind | true | 302 | 292 | | +| while_decl_bind | true | 304 | 306 | | +| while_decl_bind | true | 306 | 298 | | +| while_decl_bind | true | 307 | 308 | | +| while_decl_bind | true | 308 | 274 | | From ef1552339e1a1e5d9cf792b29008c8fa71326ce7 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 12 Oct 2018 16:32:57 +0100 Subject: [PATCH 3/3] C++: Enhance MagicConstantsNumbers test --- .../MagicConstantsNumbers.expected | 3 +++ .../MagicConstantsNumbers/templates.cpp | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/templates.cpp diff --git a/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected index 2cb34ff10acf..41c8a7e79d81 100644 --- a/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected +++ b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/MagicConstantsNumbers.expected @@ -19,3 +19,6 @@ | functions.h:3:14:3:16 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | | functions.h:3:14:3:16 | 102 | Magic constant: literal '102' is repeated 21 times and should be encapsulated in a constant. | | functions.h:12:11:12:13 | 103 | Magic constant: literal '103' is repeated 21 times and should be encapsulated in a constant. | +| templates.cpp:4:5:4:6 | 23 | Magic constant: literal '23' is repeated 21 times and should be encapsulated in a constant. | +| templates.cpp:4:5:4:6 | 23 | Magic constant: literal '23' is repeated 21 times and should be encapsulated in a constant. | +| templates.cpp:13:5:13:6 | 25 | Magic constant: literal '25' is repeated 21 times and should be encapsulated in a constant. | diff --git a/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/templates.cpp b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/templates.cpp new file mode 100644 index 000000000000..be73c87951c1 --- /dev/null +++ b/cpp/ql/test/query-tests/Best Practices/Magic Constants/MagicConstantsNumbers/templates.cpp @@ -0,0 +1,18 @@ + +template +void f(T x) { + 23; + 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; 23; + 'A'; + 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; 'A'; +} + +void g(void) { + int i; + f(i); + 25; + 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; 25; + 'B'; + 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; 'B'; +} +