maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 349848
This commit is contained in:
Volodymyr Sapsai 2018-12-20 22:43:26 +00:00
parent ddfaf07526
commit 232d22f380
3 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/CodeGen/CGClass.cpp
View File

@ -2208,6 +2208,7 @@ void CodeGenFunction::EmitInlinedInheritingCXXConstructorCall(
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;

52
clang/test/CodeGenCXX/inheriting-constructor-cleanup.cpp Normal file
View File

@ -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]])
}

43
clang/test/CodeGenObjCXX/inheriting-constructor-cleanup.mm Normal file
View File

@ -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* {{.*}})