diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-12-20 22:43:26 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-12-20 22:43:26 +0000 |
| commit | 6cbefbb5310964eb830eaf35ed1b993bb685f9ec (patch) | |
| tree | ba06070de70c7701cf326cf1b31c7790d3137882 /test/CodeGenObjCXX | |
| parent | 5af7f70eef9405bdaa895370fc4702b47f0e953a (diff) | |
[CodeGen] Fix assertion on emitting cleanup for object with inlined inherited constructor and non-trivial destructor.
Fixes assertion
> Assertion failed: (isa<X>(Val) && "cast<Ty>() argument of incompatible type!"), function cast, file llvm/Support/Casting.h, line 255.
It was triggered by trying to cast `FunctionDecl` to `CXXMethodDecl` as
`CGF.CurCodeDecl` in `CallBaseDtor::Emit`. It was happening because
cleanups were emitted in `ScalarExprEmitter::VisitExprWithCleanups`
after destroying `InlinedInheritingConstructorScope`, so
`CodeGenFunction.CurCodeDecl` didn't correspond to expected cleanup decl.
Fix the assertion by emitting cleanups before leaving
`InlinedInheritingConstructorScope` and changing `CurCodeDecl`.
Test cases based on a patch by Shoaib Meenai.
Fixes PR36748.
rdar://problem/45805151
Reviewers: rsmith, rjmccall
Reviewed By: rjmccall
Subscribers: jkorous, dexonsmith, cfe-commits, smeenai, compnerd
Differential Revision: https://reviews.llvm.org/D55543
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@349848 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CodeGenObjCXX')
| -rw-r--r-- | test/CodeGenObjCXX/inheriting-constructor-cleanup.mm | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm b/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm new file mode 100644 index 0000000000..075fa9dba0 --- /dev/null +++ b/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm @@ -0,0 +1,43 @@ +// RUN: %clang_cc1 -triple x86_64-darwin -std=c++11 -fobjc-arc -emit-llvm -o - %s | FileCheck %s --implicit-check-not "call\ " +// rdar://problem/45805151 + +struct Strong { + __strong id x; +}; + +struct Base { + // Use variadic args to cause inlining the inherited constructor. + Base(Strong s, ...) {} +}; + +struct NonTrivialDtor { + ~NonTrivialDtor() {} +}; +struct Inheritor : public NonTrivialDtor, public Base { + using Base::Base; +}; + +id g(void); +void f() { + Inheritor({g()}); +} +// CHECK-LABEL: define void @_Z1fv +// CHECK: %[[TMP:.*]] = call i8* @_Z1gv() +// CHECK: {{.*}} = call i8* @objc_retainAutoreleasedReturnValue(i8* %[[TMP]]) +// CHECK: call void (%struct.Base*, i8*, ...) @_ZN4BaseC2E6Strongz(%struct.Base* {{.*}}, i8* {{.*}}) +// CHECK-NEXT: call void @_ZN9InheritorD1Ev(%struct.Inheritor* {{.*}}) + +// CHECK-LABEL: define linkonce_odr void @_ZN4BaseC2E6Strongz(%struct.Base* {{.*}}, i8* {{.*}}, ...) +// CHECK: call void @_ZN6StrongD1Ev(%struct.Strong* {{.*}}) + +// CHECK-LABEL: define linkonce_odr void @_ZN9InheritorD1Ev(%struct.Inheritor* {{.*}}) +// CHECK: call void @_ZN9InheritorD2Ev(%struct.Inheritor* {{.*}}) + +// CHECK-LABEL: define linkonce_odr void @_ZN6StrongD1Ev(%struct.Strong* {{.*}}) +// CHECK: call void @_ZN6StrongD2Ev(%struct.Strong* {{.*}}) + +// CHECK-LABEL: define linkonce_odr void @_ZN6StrongD2Ev(%struct.Strong* {{.*}}) +// CHECK: call void @objc_storeStrong(i8** {{.*}}, i8* null) + +// CHECK-LABEL: define linkonce_odr void @_ZN9InheritorD2Ev(%struct.Inheritor* {{.*}}) +// CHECK: call void @_ZN14NonTrivialDtorD2Ev(%struct.NonTrivialDtor* {{.*}}) |