r349848 - [CodeGen] Fix assertion on emitting cleanup for object with inlined inherited constructor and non-trivial destructor.
Volodymyr Sapsai via cfe-commits
cfe-commits at lists.llvm.org
Thu Dec 20 14:43:26 PST 2018
Author: vsapsai
Date: Thu Dec 20 14:43:26 2018
New Revision: 349848
URL: http://llvm.org/viewvc/llvm-project?rev=349848&view=rev
Log:
[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
Added:
cfe/trunk/test/CodeGenCXX/inheriting-constructor-cleanup.cpp
cfe/trunk/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm
Modified:
cfe/trunk/lib/CodeGen/CGClass.cpp
Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=349848&r1=349847&r2=349848&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Thu Dec 20 14:43:26 2018
@@ -2208,6 +2208,7 @@ void CodeGenFunction::EmitInlinedInherit
GlobalDecl GD(Ctor, CtorType);
InlinedInheritingConstructorScope Scope(*this, GD);
ApplyInlineDebugLocation DebugScope(*this, GD);
+ RunCleanupsScope RunCleanups(*this);
// Save the arguments to be passed to the inherited constructor.
CXXInheritedCtorInitExprArgs = Args;
Added: cfe/trunk/test/CodeGenCXX/inheriting-constructor-cleanup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/inheriting-constructor-cleanup.cpp?rev=349848&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/inheriting-constructor-cleanup.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/inheriting-constructor-cleanup.cpp Thu Dec 20 14:43:26 2018
@@ -0,0 +1,52 @@
+// RUN: %clang_cc1 -triple x86_64-darwin -std=c++11 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-darwin -std=c++11 -fcxx-exceptions -fexceptions -emit-llvm -o - %s | FileCheck %s --check-prefix=EXCEPTIONS
+
+// PR36748
+// rdar://problem/45805151
+
+// Classes to verify order of destroying function parameters.
+struct S1 {
+ ~S1();
+};
+struct S2 {
+ ~S2();
+};
+
+struct Base {
+ // Use variadic args to cause inlining the inherited constructor.
+ Base(const S1&, const S2&, const char *fmt, ...) {}
+};
+
+struct NonTrivialDtor {
+ ~NonTrivialDtor() {}
+};
+struct Inheritor : public NonTrivialDtor, public Base {
+ using Base::Base;
+};
+
+void f() {
+ Inheritor(S1(), S2(), "foo");
+ // CHECK-LABEL: define void @_Z1fv
+ // CHECK: %[[TMP1:.*]] = alloca %struct.S1
+ // CHECK: %[[TMP2:.*]] = alloca %struct.S2
+ // CHECK: call void (%struct.Base*, %struct.S1*, %struct.S2*, i8*, ...) @_ZN4BaseC2ERK2S1RK2S2PKcz(%struct.Base* {{.*}}, %struct.S1* dereferenceable(1) %[[TMP1]], %struct.S2* dereferenceable(1) %[[TMP2]], i8* {{.*}})
+ // CHECK-NEXT: call void @_ZN9InheritorD1Ev(%struct.Inheritor* {{.*}})
+ // CHECK-NEXT: call void @_ZN2S2D1Ev(%struct.S2* %[[TMP2]])
+ // CHECK-NEXT: call void @_ZN2S1D1Ev(%struct.S1* %[[TMP1]])
+
+ // EXCEPTIONS-LABEL: define void @_Z1fv
+ // EXCEPTIONS: %[[TMP1:.*]] = alloca %struct.S1
+ // EXCEPTIONS: %[[TMP2:.*]] = alloca %struct.S2
+ // EXCEPTIONS: invoke void (%struct.Base*, %struct.S1*, %struct.S2*, i8*, ...) @_ZN4BaseC2ERK2S1RK2S2PKcz(%struct.Base* {{.*}}, %struct.S1* dereferenceable(1) %[[TMP1]], %struct.S2* dereferenceable(1) %[[TMP2]], i8* {{.*}})
+ // EXCEPTIONS-NEXT: to label %[[CONT:.*]] unwind label %[[LPAD:.*]]
+
+ // EXCEPTIONS: [[CONT]]:
+ // EXCEPTIONS-NEXT: call void @_ZN9InheritorD1Ev(%struct.Inheritor* {{.*}})
+ // EXCEPTIONS-NEXT: call void @_ZN2S2D1Ev(%struct.S2* %[[TMP2]])
+ // EXCEPTIONS-NEXT: call void @_ZN2S1D1Ev(%struct.S1* %[[TMP1]])
+
+ // EXCEPTIONS: [[LPAD]]:
+ // EXCEPTIONS: call void @_ZN14NonTrivialDtorD2Ev(%struct.NonTrivialDtor* {{.*}})
+ // EXCEPTIONS-NEXT: call void @_ZN2S2D1Ev(%struct.S2* %[[TMP2]])
+ // EXCEPTIONS-NEXT: call void @_ZN2S1D1Ev(%struct.S1* %[[TMP1]])
+}
Added: cfe/trunk/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm?rev=349848&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm (added)
+++ cfe/trunk/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm Thu Dec 20 14:43:26 2018
@@ -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* {{.*}})
More information about the cfe-commits
mailing list