replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid crashing when failing to emit a thunk 

If we crash, we raise a crash handler dialog, and that's really
annoying.  Even though we can't emit correct IR until we have musttail,
don't crash.

llvm-svn: 205948
This commit is contained in:
Reid Kleckner 2014-04-10 01:40:15 +00:00
parent 48c8c07d0a
commit 9df1d975b8
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/CodeGen/CGCall.cpp
View File

@ -2546,8 +2546,14 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
// FIXME: Do this earlier rather than hacking it in here!
llvm::Value *ArgMemory = 0;
if (llvm::StructType *ArgStruct = CallInfo.getArgStruct()) {
llvm::AllocaInst *AI = new llvm::AllocaInst(
ArgStruct, "argmem", CallArgs.getStackBase()->getNextNode());
llvm::Instruction *IP = CallArgs.getStackBase();
llvm::AllocaInst *AI;
if (IP) {
IP = IP->getNextNode();
AI = new llvm::AllocaInst(ArgStruct, "argmem", IP);
} else {
AI = Builder.CreateAlloca(ArgStruct, nullptr, "argmem");
}
AI->setUsedWithInAlloca(true);
assert(AI->isUsedWithInAlloca() && !AI->isStaticAlloca());
ArgMemory = AI;

11
clang/test/CodeGenCXX/microsoft-abi-nontrivial-memptr-thunks.cpp Normal file
View File

@ -0,0 +1,11 @@
// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple=i386-pc-win32 %s -verify
struct A {
A();
~A();
int a;
};
struct B {
virtual void f(A); // expected-error {{cannot compile this non-trivial argument copy for thunk yet}}
};
void (B::*mp)(A) = &B::f;