<div dir="ltr">I mean, the first patch is <a href="http://reviews.llvm.org/D4892">http://reviews.llvm.org/D4892</a>. :)</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 15, 2014 at 11:39 AM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">To close the loop on this, those failures were due to <a href="http://llvm.org/PR20653" target="_blank">http://llvm.org/PR20653</a>. I started working on a fix, the first patch is <a href="http://llvm.org/bugs/show_bug.cgi?id=20653" target="_blank">http://llvm.org/bugs/show_bug.cgi?id=20653</a>.</div>
<div class="HOEnZb"><div class="h5">
<div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Jul 26, 2014 at 3:13 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">remoting_unittests started failling on our bot: <a href="http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Win%20Clang/builds/2442" target="_blank">http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Win%20Clang/builds/2442</a> (this is the first build where things fail)<div>
<br></div><div>The first time, this happened after clang updated from r214002 to 214022 while nothing in remoting_unittests changed, so maybe it's related to this change?</div></div><div><div>
<div class="gmail_extra"><br><br><div class="gmail_quote">
On Fri, Jul 25, 2014 at 6:34 PM, Reid Kleckner <span dir="ltr"><<a href="mailto:reid@kleckner.net" target="_blank">reid@kleckner.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: rnk<br>
Date: Fri Jul 25 20:34:32 2014<br>
New Revision: 214004<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=214004&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=214004&view=rev</a><br>
Log:<br>
MS ABI: Use musttail for vtable thunks that pass arguments by value<br>
<br>
This moves some memptr specific code into the generic thunk emission<br>
codepath.<br>
<br>
Fixes PR20053.<br>
<br>
Reviewers: majnemer<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D4613" target="_blank">http://reviews.llvm.org/D4613</a><br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CGCall.cpp<br>
cfe/trunk/lib/CodeGen/CGVTables.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp<br>
cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp<br>
cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp<br>
cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGCall.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Fri Jul 25 20:34:32 2014<br>
@@ -2045,19 +2045,8 @@ void CodeGenFunction::EmitDelegateCallAr<br>
return args.add(RValue::get(Builder.CreateLoad(local)), type);<br>
}<br>
<br>
- if (isInAllocaArgument(CGM.getCXXABI(), type)) {<br>
- AggValueSlot Slot = createPlaceholderSlot(*this, type);<br>
- Slot.setExternallyDestructed();<br>
-<br>
- // FIXME: Either emit a copy constructor call, or figure out how to do<br>
- // guaranteed tail calls with perfect forwarding in LLVM.<br>
- CGM.ErrorUnsupported(param, "non-trivial argument copy for thunk");<br>
- EmitNullInitialization(Slot.getAddr(), type);<br>
-<br>
- RValue RV = Slot.asRValue();<br>
- args.add(RV, type);<br>
- return;<br>
- }<br>
+ assert(!isInAllocaArgument(CGM.getCXXABI(), type) &&<br>
+ "cannot emit delegate call arguments for inalloca arguments!");<br>
<br>
args.add(convertTempToRValue(local, type, loc), type);<br>
}<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGVTables.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVTables.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVTables.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGVTables.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGVTables.cpp Fri Jul 25 20:34:32 2014<br>
@@ -236,6 +236,18 @@ void CodeGenFunction::EmitCallAndReturnF<br>
*this, LoadCXXThis(), Thunk->This)<br>
: LoadCXXThis();<br>
<br>
+ if (CurFnInfo->usesInAlloca()) {<br>
+ // We don't handle return adjusting thunks, because they require us to call<br>
+ // the copy constructor. For now, fall through and pretend the return<br>
+ // adjustment was empty so we don't crash.<br>
+ if (Thunk && !Thunk->Return.isEmpty()) {<br>
+ CGM.ErrorUnsupported(<br>
+ MD, "non-trivial argument copy for return-adjusting thunk");<br>
+ }<br>
+ EmitMustTailThunk(MD, AdjustedThisPtr, Callee);<br>
+ return;<br>
+ }<br>
+<br>
// Start building CallArgs.<br>
CallArgList CallArgs;<br>
QualType ThisType = MD->getThisType(getContext());<br>
@@ -278,8 +290,9 @@ void CodeGenFunction::EmitCallAndReturnF<br>
Slot = ReturnValueSlot(ReturnValue, ResultType.isVolatileQualified());<br>
<br>
// Now emit our call.<br>
- RValue RV = EmitCall(*CurFnInfo, Callee, Slot, CallArgs, MD);<br>
-<br>
+ llvm::Instruction *CallOrInvoke;<br>
+ RValue RV = EmitCall(*CurFnInfo, Callee, Slot, CallArgs, MD, &CallOrInvoke);<br>
+<br>
// Consider return adjustment if we have ThunkInfo.<br>
if (Thunk && !Thunk->Return.isEmpty())<br>
RV = PerformReturnAdjustment(*this, ResultType, RV, *Thunk);<br>
@@ -294,6 +307,62 @@ void CodeGenFunction::EmitCallAndReturnF<br>
FinishFunction();<br>
}<br>
<br>
+void CodeGenFunction::EmitMustTailThunk(const CXXMethodDecl *MD,<br>
+ llvm::Value *AdjustedThisPtr,<br>
+ llvm::Value *Callee) {<br>
+ // Emitting a musttail call thunk doesn't use any of the CGCall.cpp machinery<br>
+ // to translate AST arguments into LLVM IR arguments. For thunks, we know<br>
+ // that the caller prototype more or less matches the callee prototype with<br>
+ // the exception of 'this'.<br>
+ SmallVector<llvm::Value *, 8> Args;<br>
+ for (llvm::Argument &A : CurFn->args())<br>
+ Args.push_back(&A);<br>
+<br>
+ // Set the adjusted 'this' pointer.<br>
+ const ABIArgInfo &ThisAI = CurFnInfo->arg_begin()->info;<br>
+ if (ThisAI.isDirect()) {<br>
+ const ABIArgInfo &RetAI = CurFnInfo->getReturnInfo();<br>
+ int ThisArgNo = RetAI.isIndirect() && !RetAI.isSRetAfterThis() ? 1 : 0;<br>
+ llvm::Type *ThisType = Args[ThisArgNo]->getType();<br>
+ if (ThisType != AdjustedThisPtr->getType())<br>
+ AdjustedThisPtr = Builder.CreateBitCast(AdjustedThisPtr, ThisType);<br>
+ Args[ThisArgNo] = AdjustedThisPtr;<br>
+ } else {<br>
+ assert(ThisAI.isInAlloca() && "this is passed directly or inalloca");<br>
+ llvm::Value *ThisAddr = GetAddrOfLocalVar(CXXABIThisDecl);<br>
+ llvm::Type *ThisType =<br>
+ cast<llvm::PointerType>(ThisAddr->getType())->getElementType();<br>
+ if (ThisType != AdjustedThisPtr->getType())<br>
+ AdjustedThisPtr = Builder.CreateBitCast(AdjustedThisPtr, ThisType);<br>
+ Builder.CreateStore(AdjustedThisPtr, ThisAddr);<br>
+ }<br>
+<br>
+ // Emit the musttail call manually. Even if the prologue pushed cleanups, we<br>
+ // don't actually want to run them.<br>
+ llvm::CallInst *Call = Builder.CreateCall(Callee, Args);<br>
+ Call->setTailCallKind(llvm::CallInst::TCK_MustTail);<br>
+<br>
+ // Apply the standard set of call attributes.<br>
+ unsigned CallingConv;<br>
+ CodeGen::AttributeListType AttributeList;<br>
+ CGM.ConstructAttributeList(*CurFnInfo, MD, AttributeList, CallingConv,<br>
+ /*AttrOnCallSite=*/true);<br>
+ llvm::AttributeSet Attrs =<br>
+ llvm::AttributeSet::get(getLLVMContext(), AttributeList);<br>
+ Call->setAttributes(Attrs);<br>
+ Call->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));<br>
+<br>
+ if (Call->getType()->isVoidTy())<br>
+ Builder.CreateRetVoid();<br>
+ else<br>
+ Builder.CreateRet(Call);<br>
+<br>
+ // Finish the function to maintain CodeGenFunction invariants.<br>
+ // FIXME: Don't emit unreachable code.<br>
+ EmitBlock(createBasicBlock());<br>
+ FinishFunction();<br>
+}<br>
+<br>
void CodeGenFunction::GenerateThunk(llvm::Function *Fn,<br>
const CGFunctionInfo &FnInfo,<br>
GlobalDecl GD, const ThunkInfo &Thunk) {<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Fri Jul 25 20:34:32 2014<br>
@@ -1210,6 +1210,10 @@ public:<br>
<br>
void EmitCallAndReturnForThunk(llvm::Value *Callee, const ThunkInfo *Thunk);<br>
<br>
+ /// Emit a musttail call for a thunk with a potentially adjusted this pointer.<br>
+ void EmitMustTailThunk(const CXXMethodDecl *MD, llvm::Value *AdjustedThisPtr,<br>
+ llvm::Value *Callee);<br>
+<br>
/// GenerateThunk - Generate a thunk for the given method.<br>
void GenerateThunk(llvm::Function *Fn, const CGFunctionInfo &FnInfo,<br>
GlobalDecl GD, const ThunkInfo &Thunk);<br>
<br>
Modified: cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp Fri Jul 25 20:34:32 2014<br>
@@ -1467,31 +1467,7 @@ llvm::Function *MicrosoftCXXABI::EmitVir<br>
CGF.Builder.CreateConstInBoundsGEP1_64(VTable, ML.Index, "vfn");<br>
llvm::Value *Callee = CGF.Builder.CreateLoad(VFuncPtr);<br>
<br>
- unsigned CallingConv;<br>
- CodeGen::AttributeListType AttributeList;<br>
- CGM.ConstructAttributeList(FnInfo, MD, AttributeList, CallingConv, true);<br>
- llvm::AttributeSet Attrs =<br>
- llvm::AttributeSet::get(CGF.getLLVMContext(), AttributeList);<br>
-<br>
- // Do a musttail call with perfect argument forwarding. Any inalloca argument<br>
- // will be forwarded in place without any copy.<br>
- SmallVector<llvm::Value *, 8> Args;<br>
- for (llvm::Argument &A : ThunkFn->args())<br>
- Args.push_back(&A);<br>
- llvm::CallInst *Call = CGF.Builder.CreateCall(Callee, Args);<br>
- Call->setTailCallKind(llvm::CallInst::TCK_MustTail);<br>
- Call->setAttributes(Attrs);<br>
- Call->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));<br>
-<br>
- if (Call->getType()->isVoidTy())<br>
- CGF.Builder.CreateRetVoid();<br>
- else<br>
- CGF.Builder.CreateRet(Call);<br>
-<br>
- // Finish the function to maintain CodeGenFunction invariants.<br>
- // FIXME: Don't emit unreachable code.<br>
- CGF.EmitBlock(CGF.createBasicBlock());<br>
- CGF.FinishFunction();<br>
+ CGF.EmitCallAndReturnForThunk(Callee, 0);<br>
<br>
return ThunkFn;<br>
}<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-byval-thunks.cpp Fri Jul 25 20:34:32 2014<br>
@@ -1,4 +1,4 @@<br>
-// RUN: not %clang_cc1 %s -fno-rtti -triple=i686-pc-win32 -emit-llvm -o /dev/null 2>&1 | FileCheck --check-prefix=CHECK32 %s<br>
+// RUN: %clang_cc1 %s -fno-rtti -triple=i686-pc-win32 -emit-llvm -o - | FileCheck --check-prefix=CHECK32 %s<br>
// RUN: %clang_cc1 %s -fno-rtti -triple=x86_64-pc-win32 -emit-llvm -o - | FileCheck --check-prefix=CHECK64 %s<br>
<br>
namespace byval_thunk {<br>
@@ -11,15 +11,103 @@ struct Agg {<br>
<br>
struct A { virtual void foo(Agg x); };<br>
struct B { virtual void foo(Agg x); };<br>
-struct C : A, B { virtual void foo(Agg x); };<br>
-C c;<br>
+struct C : A, B { C(); virtual void foo(Agg x); };<br>
+C::C() {} // force emission<br>
<br>
-// CHECK32: cannot compile this non-trivial argument copy for thunk yet<br>
+// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void @"\01?foo@C@byval_thunk@@W3AEXUAgg@2@@Z"<br>
+// CHECK32: (%"struct.byval_thunk::C"* %this, <{ %"struct.byval_thunk::Agg" }>* inalloca)<br>
+// CHECK32: %2 = getelementptr i8* %{{.*}}, i32 -4<br>
+// CHECK32: musttail call x86_thiscallcc void @"\01?foo@C@byval_thunk@@UAEXUAgg@2@@Z"<br>
+// CHECK32: (%"struct.byval_thunk::C"* %{{.*}}, <{ %"struct.byval_thunk::Agg" }>* inalloca %0)<br>
+// CHECK32-NEXT: ret void<br>
<br>
// CHECK64-LABEL: define linkonce_odr void @"\01?foo@C@byval_thunk@@W7EAAXUAgg@2@@Z"<br>
// CHECK64: (%"struct.byval_thunk::C"* %this, %"struct.byval_thunk::Agg"* %x)<br>
// CHECK64: getelementptr i8* %{{.*}}, i32 -8<br>
-// CHECK64: call void @"\01?foo@C@byval_thunk@@UEAAXUAgg@2@@Z"(%"struct.byval_thunk::C"* %{{.*}}, %"struct.byval_thunk::Agg"* %x)<br>
+// CHECK64: call void @"\01?foo@C@byval_thunk@@UEAAXUAgg@2@@Z"<br>
+// CHECK64: (%"struct.byval_thunk::C"* %{{.*}}, %"struct.byval_thunk::Agg"* %x)<br>
// CHECK64-NOT: call<br>
// CHECK64: ret void<br>
}<br>
+<br>
+namespace stdcall_thunk {<br>
+struct Agg {<br>
+ Agg();<br>
+ Agg(const Agg &);<br>
+ ~Agg();<br>
+ int x;<br>
+};<br>
+<br>
+struct A { virtual void __stdcall foo(Agg x); };<br>
+struct B { virtual void __stdcall foo(Agg x); };<br>
+struct C : A, B { C(); virtual void __stdcall foo(Agg x); };<br>
+C::C() {} // force emission<br>
+<br>
+// CHECK32-LABEL: define linkonce_odr x86_stdcallcc void @"\01?foo@C@stdcall_thunk@@W3AGXUAgg@2@@Z"<br>
+// CHECK32: (<{ %"struct.stdcall_thunk::C"*, %"struct.stdcall_thunk::Agg" }>* inalloca)<br>
+// CHECK32: %[[this_slot:[^ ]*]] = getelementptr inbounds <{ %"struct.stdcall_thunk::C"*, %"struct.stdcall_thunk::Agg" }>* %0, i32 0, i32 0<br>
+// CHECK32: load %"struct.stdcall_thunk::C"** %[[this_slot]]<br>
+// CHECK32: getelementptr i8* %{{.*}}, i32 -4<br>
+// CHECK32: store %"struct.stdcall_thunk::C"* %{{.*}}, %"struct.stdcall_thunk::C"** %[[this_slot]]<br>
+// CHECK32: musttail call x86_stdcallcc void @"\01?foo@C@stdcall_thunk@@UAGXUAgg@2@@Z"<br>
+// CHECK32: (<{ %"struct.stdcall_thunk::C"*, %"struct.stdcall_thunk::Agg" }>* inalloca %0)<br>
+// CHECK32-NEXT: ret void<br>
+<br>
+// CHECK64-LABEL: define linkonce_odr void @"\01?foo@C@stdcall_thunk@@W7EAAXUAgg@2@@Z"<br>
+// CHECK64: (%"struct.stdcall_thunk::C"* %this, %"struct.stdcall_thunk::Agg"* %x)<br>
+// CHECK64: getelementptr i8* %{{.*}}, i32 -8<br>
+// CHECK64: call void @"\01?foo@C@stdcall_thunk@@UEAAXUAgg@2@@Z"<br>
+// CHECK64: (%"struct.stdcall_thunk::C"* %{{.*}}, %"struct.stdcall_thunk::Agg"* %x)<br>
+// CHECK64-NOT: call<br>
+// CHECK64: ret void<br>
+}<br>
+<br>
+namespace sret_thunk {<br>
+struct Agg {<br>
+ Agg();<br>
+ Agg(const Agg &);<br>
+ ~Agg();<br>
+ int x;<br>
+};<br>
+<br>
+struct A { virtual Agg __cdecl foo(Agg x); };<br>
+struct B { virtual Agg __cdecl foo(Agg x); };<br>
+struct C : A, B { C(); virtual Agg __cdecl foo(Agg x); };<br>
+C::C() {} // force emission<br>
+<br>
+// CHECK32-LABEL: define linkonce_odr %"struct.sret_thunk::Agg"* @"\01?foo@C@sret_thunk@@W3AA?AUAgg@2@U32@@Z"<br>
+// CHECK32: (<{ %"struct.sret_thunk::C"*, %"struct.sret_thunk::Agg"*, %"struct.sret_thunk::Agg" }>* inalloca)<br>
+// CHECK32: %[[this_slot:[^ ]*]] = getelementptr inbounds <{ %"struct.sret_thunk::C"*, %"struct.sret_thunk::Agg"*, %"struct.sret_thunk::Agg" }>* %0, i32 0, i32 0<br>
+// CHECK32: load %"struct.sret_thunk::C"** %[[this_slot]]<br>
+// CHECK32: getelementptr i8* %{{.*}}, i32 -4<br>
+// CHECK32: store %"struct.sret_thunk::C"* %{{.*}}, %"struct.sret_thunk::C"** %[[this_slot]]<br>
+// CHECK32: %[[rv:[^ ]*]] = musttail call %"struct.sret_thunk::Agg"* @"\01?foo@C@sret_thunk@@UAA?AUAgg@2@U32@@Z"<br>
+// CHECK32: (<{ %"struct.sret_thunk::C"*, %"struct.sret_thunk::Agg"*, %"struct.sret_thunk::Agg" }>* inalloca %0)<br>
+// CHECK32-NEXT: ret %"struct.sret_thunk::Agg"* %[[rv]]<br>
+<br>
+// CHECK64-LABEL: define linkonce_odr void @"\01?foo@C@sret_thunk@@W7EAA?AUAgg@2@U32@@Z"<br>
+// CHECK64: (%"struct.sret_thunk::C"* %this, %"struct.sret_thunk::Agg"* noalias sret %agg.result, %"struct.sret_thunk::Agg"* %x)<br>
+// CHECK64: getelementptr i8* %{{.*}}, i32 -8<br>
+// CHECK64: call void @"\01?foo@C@sret_thunk@@UEAA?AUAgg@2@U32@@Z"<br>
+// CHECK64: (%"struct.sret_thunk::C"* %{{.*}}, %"struct.sret_thunk::Agg"* sret %agg.result, %"struct.sret_thunk::Agg"* %x)<br>
+// CHECK64-NOT: call<br>
+// CHECK64: ret void<br>
+}<br>
+<br>
+#if 0<br>
+// FIXME: When we extend LLVM IR to allow forwarding of varargs through musttail<br>
+// calls, use this test.<br>
+namespace variadic_thunk {<br>
+struct Agg {<br>
+ Agg();<br>
+ Agg(const Agg &);<br>
+ ~Agg();<br>
+ int x;<br>
+};<br>
+<br>
+struct A { virtual void foo(Agg x, ...); };<br>
+struct B { virtual void foo(Agg x, ...); };<br>
+struct C : A, B { C(); virtual void foo(Agg x, ...); };<br>
+C::C() {} // force emission<br>
+}<br>
+#endif<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-nontrivial-covariant-thunk.cpp Fri Jul 25 20:34:32 2014<br>
@@ -18,7 +18,7 @@ struct B {<br>
struct C : A, B {<br>
C();<br>
int c;<br>
- virtual C *clone(A); // expected-error {{cannot compile this non-trivial argument copy for thunk yet}}<br>
+ virtual C *clone(A); // expected-error {{cannot compile this non-trivial argument copy for return-adjusting thunk yet}}<br>
};<br>
B::B() {} // force emission<br>
C::C() {} // force emission<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp?rev=214004&r1=214003&r2=214004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp?rev=214004&r1=214003&r2=214004&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp Fri Jul 25 20:34:32 2014<br>
@@ -18,6 +18,7 @@ struct C {<br>
virtual int bar(int, double);<br>
virtual S baz(int);<br>
virtual S qux(U);<br>
+ virtual S __fastcall zed(U);<br>
};<br>
<br>
namespace {<br>
@@ -43,6 +44,9 @@ void f() {<br>
S (C::*ptr5)(U);<br>
ptr5 = &C::qux;<br>
<br>
+ S (__fastcall C::*ptr6)(U);<br>
+ ptr6 = &C::zed;<br>
+<br>
<br>
// CHECK32-LABEL: define void @"\01?f@@YAXXZ"()<br>
// CHECK32: store i8* bitcast (void (%struct.C*)* @"\01??_9C@@$BA@AE" to i8*), i8** %ptr<br>
@@ -64,14 +68,14 @@ void f() {<br>
// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void @"\01??_9C@@$BA@AE"(%struct.C* %this) unnamed_addr<br>
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*)** %{{.*}}, i64 0<br>
// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*)** [[VPTR]]<br>
-// CHECK32: musttail call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}})<br>
+// CHECK32: call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}})<br>
// CHECK32: ret void<br>
// CHECK32: }<br>
//<br>
// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BA@AA"(%struct.C* %this) unnamed_addr<br>
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*)** %{{.*}}, i64 0<br>
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*)** [[VPTR]]<br>
-// CHECK64: musttail call void [[CALLEE]](%struct.C* %{{.*}})<br>
+// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}})<br>
// CHECK64: ret void<br>
// CHECK64: }<br>
<br>
@@ -79,14 +83,14 @@ void f() {<br>
// CHECK32-LABEL: define linkonce_odr x86_thiscallcc i32 @"\01??_9C@@$B3AE"(%struct.C* %this, i32, double) unnamed_addr<br>
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds i32 (%struct.C*, i32, double)** %{{.*}}, i64 1<br>
// CHECK32: [[CALLEE:%.*]] = load i32 (%struct.C*, i32, double)** [[VPTR]]<br>
-// CHECK32: [[CALL:%.*]] = musttail call x86_thiscallcc i32 [[CALLEE]](%struct.C* %{{.*}}, i32 %{{.*}}, double %{{.*}})<br>
+// CHECK32: [[CALL:%.*]] = call x86_thiscallcc i32 [[CALLEE]](%struct.C* %{{.*}}, i32 %{{.*}}, double %{{.*}})<br>
// CHECK32: ret i32 [[CALL]]<br>
// CHECK32: }<br>
//<br>
// CHECK64-LABEL: define linkonce_odr i32 @"\01??_9C@@$B7AA"(%struct.C* %this, i32, double) unnamed_addr<br>
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds i32 (%struct.C*, i32, double)** %{{.*}}, i64 1<br>
// CHECK64: [[CALLEE:%.*]] = load i32 (%struct.C*, i32, double)** [[VPTR]]<br>
-// CHECK64: [[CALL:%.*]] = musttail call i32 [[CALLEE]](%struct.C* %{{.*}}, i32 %{{.*}}, double %{{.*}})<br>
+// CHECK64: [[CALL:%.*]] = call i32 [[CALLEE]](%struct.C* %{{.*}}, i32 %{{.*}}, double %{{.*}})<br>
// CHECK64: ret i32 [[CALL]]<br>
// CHECK64: }<br>
<br>
@@ -94,14 +98,14 @@ void f() {<br>
// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void @"\01??_9C@@$B7AE"(%struct.C* %this, %struct.S* noalias sret %agg.result, i32) unnamed_addr<br>
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*, %struct.S*, i32)** %{{.*}}, i64 2<br>
// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, i32)** [[VPTR]]<br>
-// CHECK32: musttail call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, i32 %{{.*}})<br>
+// CHECK32: call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, i32 %{{.*}})<br>
// CHECK32: ret void<br>
// CHECK32: }<br>
//<br>
// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBA@AA"(%struct.C* %this, %struct.S* noalias sret %agg.result, i32) unnamed_addr<br>
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*, %struct.S*, i32)** %{{.*}}, i64 2<br>
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, i32)** [[VPTR]]<br>
-// CHECK64: musttail call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, i32 %{{.*}})<br>
+// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, i32 %{{.*}})<br>
// CHECK64: ret void<br>
// CHECK64: }<br>
<br>
@@ -109,28 +113,45 @@ void f() {<br>
// CHECK32-LABEL: define internal x86_thiscallcc void @"\01??_9D@?A@@$BA@AE"(%"struct.(anonymous namespace)::D"* %this) unnamed_addr<br>
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%"struct.(anonymous namespace)::D"*)** %{{.*}}, i64 0<br>
// CHECK32: [[CALLEE:%.*]] = load void (%"struct.(anonymous namespace)::D"*)** [[VPTR]]<br>
-// CHECK32: musttail call x86_thiscallcc void [[CALLEE]](%"struct.(anonymous namespace)::D"* %{{.*}})<br>
+// CHECK32: call x86_thiscallcc void [[CALLEE]](%"struct.(anonymous namespace)::D"* %{{.*}})<br>
// CHECK32: ret void<br>
// CHECK32: }<br>
//<br>
// CHECK64-LABEL: define internal void @"\01??_9D@?A@@$BA@AA"(%"struct.(anonymous namespace)::D"* %this) unnamed_addr<br>
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%"struct.(anonymous namespace)::D"*)** %{{.*}}, i64 0<br>
// CHECK64: [[CALLEE:%.*]] = load void (%"struct.(anonymous namespace)::D"*)** [[VPTR]]<br>
-// CHECK64: musttail call void [[CALLEE]](%"struct.(anonymous namespace)::D"* %{{.*}})<br>
+// CHECK64: call void [[CALLEE]](%"struct.(anonymous namespace)::D"* %{{.*}})<br>
// CHECK64: ret void<br>
// CHECK64: }<br>
<br>
-// Thunk for calling the fourth virtual function in C, taking a struct parameter and returning a struct.<br>
+// Thunk for calling the fourth virtual function in C, taking a struct parameter<br>
+// and returning a struct.<br>
// CHECK32-LABEL: define linkonce_odr x86_thiscallcc %struct.S* @"\01??_9C@@$BM@AE"(%struct.C* %this, <{ %struct.S*, %struct.U }>* inalloca) unnamed_addr<br>
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds %struct.S* (%struct.C*, <{ %struct.S*, %struct.U }>*)** %{{.*}}, i64 3<br>
// CHECK32: [[CALLEE:%.*]] = load %struct.S* (%struct.C*, <{ %struct.S*, %struct.U }>*)** [[VPTR]]<br>
-// CHECK32: [[CALL:%.*]] = musttail call x86_thiscallcc %struct.S* [[CALLEE]](%struct.C* %this, <{ %struct.S*, %struct.U }>* inalloca %{{.*}})<br>
-// CHECK32: ret %struct.S* [[CALL]]<br>
+// CHECK32: [[CALL:%.*]] = musttail call x86_thiscallcc %struct.S* [[CALLEE]](%struct.C* %{{.*}}, <{ %struct.S*, %struct.U }>* inalloca %{{.*}})<br>
+// CHECK32-NEXT: ret %struct.S* [[CALL]]<br>
// CHECK32: }<br>
//<br>
// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBI@AA"(%struct.C* %this, %struct.S* noalias sret %agg.result, %struct.U*) unnamed_addr<br>
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*, %struct.S*, %struct.U*)** %{{.*}}, i64 3<br>
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, %struct.U*)** [[VPTR]]<br>
-// CHECK64: musttail call void [[CALLEE]](%struct.C* %this, %struct.S* sret %agg.result, %struct.U* %{{.*}})<br>
+// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, %struct.U* %{{.*}})<br>
+// CHECK64: ret void<br>
+// CHECK64: }<br>
+<br>
+// Thunk for calling the fifth virtual function in C, taking a struct parameter<br>
+// and returning a struct.<br>
+// CHECK32-LABEL: define linkonce_odr x86_fastcallcc void @"\01??_9C@@$BBA@AE"(%struct.C* inreg %this, %struct.S* inreg noalias sret %agg.result, <{ %struct.U }>* inalloca) unnamed_addr<br>
+// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*, %struct.S*, <{ %struct.U }>*)** %{{.*}}, i64 4<br>
+// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, <{ %struct.U }>*)** [[VPTR]]<br>
+// CHECK32: musttail call x86_fastcallcc void [[CALLEE]](%struct.C* inreg %{{.*}}, %struct.S* inreg sret %{{.*}}, <{ %struct.U }>* inalloca %{{.*}})<br>
+// CHECK32-NEXT: ret void<br>
+// CHECK32: }<br>
+//<br>
+// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BCA@AA"(%struct.C* %this, %struct.S* noalias sret %agg.result, %struct.U*) unnamed_addr<br>
+// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*, %struct.S*, %struct.U*)** %{{.*}}, i64 4<br>
+// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, %struct.U*)** [[VPTR]]<br>
+// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret %agg.result, %struct.U* %{{.*}})<br>
// CHECK64: ret void<br>
// CHECK64: }<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
<br></blockquote></div><br></div>
</div></div></blockquote></div><br></div>