Skip to content

C++: test fixes for extractor frontend upgrade #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 26, 2018
Merged

C++: test fixes for extractor frontend upgrade #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd169d1
C++: fix test to enable C++11 support in frontend
nickrolfe Aug 15, 2018
04385a8
C++: fix tests: frontend no longer optimises dynamic_cast to base type
nickrolfe Aug 15, 2018
da7d706
C++: accept more test changes following extractor frontend upgrade
nickrolfe Aug 15, 2018
193e013
C++: accept more extraction of functions in local classes/lambdas
nickrolfe Aug 17, 2018
7cf550a
C++: regression test for extractor bug with enum in template class
nickrolfe Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ary-tests/clang_builtin_macros/extended.c → ...y-tests/clang_builtin_macros/extended.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// semmle-extractor-options: --edg --clang --edg --c++11 --edg --nullptr

static int has_nullptr_f = __has_feature(cxx_nullptr);
static int has_nullptr_e = __has_extension(cxx_nullptr);
// semmle-extractor-options: --edg --clang --edg --c++ --edg --nullptr
4 changes: 2 additions & 2 deletions cpp/ql/test/library-tests/clang_builtin_macros/values.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
| | gp_offset | <no initialiser value> |
| | overflow_arg_area | <no initialiser value> |
| | reg_save_area | <no initialiser value> |
| extended.c | has_nullptr_e | 1 |
| extended.c | has_nullptr_f | 1 |
| extended.cpp | has_nullptr_e | 1 |
| extended.cpp | has_nullptr_f | 1 |
| gcc492.c | has_include | 1 |
| gcc492.c | has_macro_include | 1 |
| gcc492.c | has_missing_include | 0 |
Expand Down
4 changes: 2 additions & 2 deletions cpp/ql/test/library-tests/conversions/conversions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ void DynamicCast() {
PolymorphicBase* pb = &b;
PolymorphicDerived* pd = &d;

// These two casts are represented as BaseClassCasts because they can be resolved at compile time.
pb = dynamic_cast<PolymorphicBase*>(pd);
// These two casts were previously represented as BaseClassCasts because they were resolved at compile time, but the front-end no longer performs this optimization.
pb = dynamic_cast<PolymorphicBase*>(pd);
PolymorphicBase& rb = dynamic_cast<PolymorphicBase&>(d);

pd = dynamic_cast<PolymorphicDerived*>(pb);
Expand Down
4 changes: 2 additions & 2 deletions cpp/ql/test/library-tests/conversions/conversions.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@
| conversions.cpp:207:7:207:31 | reinterpret_cast<long>... | pointer to integral conversion | prval | long | void * |
| conversions.cpp:208:7:208:14 | (void *)... | integral to pointer conversion | prval | void * | long |
| conversions.cpp:209:7:209:32 | reinterpret_cast<void *>... | integral to pointer conversion | prval | void * | long |
| conversions.cpp:227:8:227:41 | (PolymorphicBase *)... | base class conversion | prval | PolymorphicBase * | PolymorphicDerived * |
| conversions.cpp:228:25:228:57 | (PolymorphicBase)... | base class conversion | lval | PolymorphicBase | PolymorphicDerived |
| conversions.cpp:227:8:227:41 | dynamic_cast<PolymorphicBase *>... | dynamic_cast | prval | PolymorphicBase * | PolymorphicDerived * |
| conversions.cpp:228:25:228:57 | dynamic_cast<PolymorphicBase>... | dynamic_cast | lval | PolymorphicBase | PolymorphicDerived |
| conversions.cpp:230:8:230:44 | dynamic_cast<PolymorphicDerived *>... | dynamic_cast | prval | PolymorphicDerived * | PolymorphicBase * |
| conversions.cpp:231:28:231:63 | dynamic_cast<PolymorphicDerived>... | dynamic_cast | lval | PolymorphicDerived | PolymorphicBase |
| conversions.cpp:235:7:235:16 | (void *)... | pointer conversion | prval | void * | ..(*)(..) |
Expand Down
2 changes: 1 addition & 1 deletion cpp/ql/test/library-tests/friends/loop/friends.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
| file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:26 | E<D> |
| loop.cpp:6:5:6:5 | E<T>'s friend | loop.cpp:5:26:5:26 | E<T> |
| loop.cpp:7:5:7:5 | E<T>'s friend | loop.cpp:7:36:7:36 | F<U> |
| loop.cpp:11:5:11:5 | F<T>'s friend | loop.cpp:5:26:5:26 | E<T> |
| loop.cpp:11:5:11:5 | F<T>'s friend | loop.cpp:11:36:11:36 | E<U> |
8 changes: 4 additions & 4 deletions cpp/ql/test/library-tests/ir/ir/PrintAST.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5583,8 +5583,8 @@ ir.cpp:
# 857| 0: pb
# 857| Type = PolymorphicBase *
# 857| ValueCategory = lvalue
# 857| 1: (PolymorphicBase *)...
# 857| Conversion = base class conversion
# 857| 1: dynamic_cast<PolymorphicBase *>...
# 857| Conversion = dynamic_cast
# 857| Type = PolymorphicBase *
# 857| ValueCategory = prvalue
# 857| expr: pd
Expand All @@ -5597,8 +5597,8 @@ ir.cpp:
# 858| expr: (reference to)
# 858| Type = PolymorphicBase &
# 858| ValueCategory = prvalue
# 858| expr: (PolymorphicBase)...
# 858| Conversion = base class conversion
# 858| expr: dynamic_cast<PolymorphicBase>...
# 858| Conversion = dynamic_cast
# 858| Type = PolymorphicBase
# 858| ValueCategory = lvalue
# 858| expr: d
Expand Down
92 changes: 46 additions & 46 deletions cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3559,52 +3559,52 @@ ir.cpp:

# 849| DynamicCast() -> void
# 849| Block 0
# 849| v0_0(void) = EnterFunction :
# 849| mu0_1(unknown) = UnmodeledDefinition :
# 850| r0_2(glval<PolymorphicBase>) = VariableAddress[b] :
#-----| r0_3(glval<unknown>) = FunctionAddress[PolymorphicBase] :
#-----| v0_4(void) = Invoke : r0_3, this:r0_2
# 851| r0_5(glval<PolymorphicDerived>) = VariableAddress[d] :
# 851| r0_6(glval<unknown>) = FunctionAddress[PolymorphicDerived] :
# 851| v0_7(void) = Invoke : r0_6, this:r0_5
# 853| r0_8(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 853| r0_9(glval<PolymorphicBase>) = VariableAddress[b] :
# 853| m0_10(PolymorphicBase *) = Store : r0_8, r0_9
# 854| r0_11(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 854| r0_12(glval<PolymorphicDerived>) = VariableAddress[d] :
# 854| m0_13(PolymorphicDerived *) = Store : r0_11, r0_12
# 857| r0_14(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 857| r0_15(PolymorphicDerived *) = Load : r0_14, m0_13
# 857| r0_16(PolymorphicBase *) = ConvertToBase[PolymorphicDerived : PolymorphicBase] : r0_15
# 857| r0_17(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 857| m0_18(PolymorphicBase *) = Store : r0_17, r0_16
# 858| r0_19(glval<PolymorphicBase &>) = VariableAddress[rb] :
# 858| r0_20(glval<PolymorphicDerived>) = VariableAddress[d] :
# 858| r0_21(glval<PolymorphicBase>) = ConvertToBase[PolymorphicDerived : PolymorphicBase] : r0_20
# 858| m0_22(PolymorphicBase &) = Store : r0_19, r0_21
# 860| r0_23(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 860| r0_24(PolymorphicBase *) = Load : r0_23, m0_18
# 860| r0_25(PolymorphicDerived *) = CheckedConvertOrNull : r0_24
# 860| r0_26(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 860| m0_27(PolymorphicDerived *) = Store : r0_26, r0_25
# 861| r0_28(glval<PolymorphicDerived &>) = VariableAddress[rd] :
# 861| r0_29(glval<PolymorphicBase>) = VariableAddress[b] :
# 861| r0_30(glval<PolymorphicDerived>) = CheckedConvertOrThrow : r0_29
# 861| m0_31(PolymorphicDerived &) = Store : r0_28, r0_30
# 863| r0_32(glval<void *>) = VariableAddress[pv] :
# 863| r0_33(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 863| r0_34(PolymorphicBase *) = Load : r0_33, m0_18
# 863| r0_35(void *) = DynamicCastToVoid : r0_34
# 863| m0_36(void *) = Store : r0_32, r0_35
# 864| r0_37(glval<void *>) = VariableAddress[pcv] :
# 864| r0_38(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 864| r0_39(PolymorphicDerived *) = Load : r0_38, m0_27
# 864| r0_40(void *) = DynamicCastToVoid : r0_39
# 864| m0_41(void *) = Store : r0_37, r0_40
# 865| v0_42(void) = NoOp :
# 849| v0_43(void) = ReturnVoid :
# 849| v0_44(void) = UnmodeledUse : mu*
# 849| v0_45(void) = ExitFunction :
# 849| v0_0(void) = EnterFunction :
# 849| mu0_1(unknown) = UnmodeledDefinition :
# 850| r0_2(glval<PolymorphicBase>) = VariableAddress[b] :
#-----| r0_3(glval<unknown>) = FunctionAddress[PolymorphicBase] :
#-----| v0_4(void) = Invoke : r0_3, this:r0_2
# 851| r0_5(glval<PolymorphicDerived>) = VariableAddress[d] :
# 851| r0_6(glval<unknown>) = FunctionAddress[PolymorphicDerived] :
# 851| v0_7(void) = Invoke : r0_6, this:r0_5
# 853| r0_8(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 853| r0_9(glval<PolymorphicBase>) = VariableAddress[b] :
# 853| m0_10(PolymorphicBase *) = Store : r0_8, r0_9
# 854| r0_11(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 854| r0_12(glval<PolymorphicDerived>) = VariableAddress[d] :
# 854| m0_13(PolymorphicDerived *) = Store : r0_11, r0_12
# 857| r0_14(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 857| r0_15(PolymorphicDerived *) = Load : r0_14, m0_13
# 857| r0_16(PolymorphicBase *) = CheckedConvertOrNull : r0_15
# 857| r0_17(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 857| m0_18(PolymorphicBase *) = Store : r0_17, r0_16
# 858| r0_19(glval<PolymorphicBase &>) = VariableAddress[rb] :
# 858| r0_20(glval<PolymorphicDerived>) = VariableAddress[d] :
# 858| r0_21(glval<PolymorphicBase>) = CheckedConvertOrThrow : r0_20
# 858| m0_22(PolymorphicBase &) = Store : r0_19, r0_21
# 860| r0_23(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 860| r0_24(PolymorphicBase *) = Load : r0_23, m0_18
# 860| r0_25(PolymorphicDerived *) = CheckedConvertOrNull : r0_24
# 860| r0_26(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 860| m0_27(PolymorphicDerived *) = Store : r0_26, r0_25
# 861| r0_28(glval<PolymorphicDerived &>) = VariableAddress[rd] :
# 861| r0_29(glval<PolymorphicBase>) = VariableAddress[b] :
# 861| r0_30(glval<PolymorphicDerived>) = CheckedConvertOrThrow : r0_29
# 861| m0_31(PolymorphicDerived &) = Store : r0_28, r0_30
# 863| r0_32(glval<void *>) = VariableAddress[pv] :
# 863| r0_33(glval<PolymorphicBase *>) = VariableAddress[pb] :
# 863| r0_34(PolymorphicBase *) = Load : r0_33, m0_18
# 863| r0_35(void *) = DynamicCastToVoid : r0_34
# 863| m0_36(void *) = Store : r0_32, r0_35
# 864| r0_37(glval<void *>) = VariableAddress[pcv] :
# 864| r0_38(glval<PolymorphicDerived *>) = VariableAddress[pd] :
# 864| r0_39(PolymorphicDerived *) = Load : r0_38, m0_27
# 864| r0_40(void *) = DynamicCastToVoid : r0_39
# 864| m0_41(void *) = Store : r0_37, r0_40
# 865| v0_42(void) = NoOp :
# 849| v0_43(void) = ReturnVoid :
# 849| v0_44(void) = UnmodeledUse : mu*
# 849| v0_45(void) = ExitFunction :

# 867| String::String() -> void
# 867| Block 0
Expand Down
Loading