Author: rnk
Date: Fri Aug 15 13:12:40 2014
New Revision: 215745
URL: http://llvm.org/viewvc/llvm-project?rev=215745&view=rev
Log:
MS ABI: Virtual member pointer thunks are not unnamed_addr
They can be compared for identity.
Modified:
cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp
cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp
Modified: cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp?rev=215745&r1=215744&r2=215745&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp (original)
+++ cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp Fri Aug 15 13:12:40 2014
@@ -1459,6 +1459,9 @@ llvm::Function *MicrosoftCXXABI::EmitVir
CGM.SetLLVMFunctionAttributes(MD, FnInfo, ThunkFn);
CGM.SetLLVMFunctionAttributesForDefinition(MD, ThunkFn);
+ // These thunks can be compared, so they are not unnamed.
+ ThunkFn->setUnnamedAddr(false);
+
// Start codegen.
CodeGenFunction CGF(CGM);
CGF.StartThunk(ThunkFn, MD, FnInfo);
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp?rev=215745&r1=215744&r2=215745&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp
(original)
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp Fri Aug
15 13:12:40 2014
@@ -65,14 +65,16 @@ void f() {
// Thunk for calling the 1st virtual function in C with no parameters.
-// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void
@"\01??_9C@@$BA@AE"(%struct.C* %this) unnamed_addr
+// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void
@"\01??_9C@@$BA@AE"(%struct.C* %this)
+// CHECK32-NOT: unnamed_addr
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*)** %{{.*}},
i64 0
// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*)** [[VPTR]]
// CHECK32: call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}})
// CHECK32: ret void
// CHECK32: }
//
-// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BA@AA"(%struct.C*
%this) unnamed_addr
+// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BA@AA"(%struct.C*
%this)
+// CHECK64-NOT: unnamed_addr
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*)** %{{.*}},
i64 0
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*)** [[VPTR]]
// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}})
@@ -80,14 +82,14 @@ void f() {
// CHECK64: }
// Thunk for calling the 2nd virtual function in C, taking int and double as
parameters, returning int.
-// CHECK32-LABEL: define linkonce_odr x86_thiscallcc i32
@"\01??_9C@@$B3AE"(%struct.C* %this, i32, double) unnamed_addr
+// CHECK32-LABEL: define linkonce_odr x86_thiscallcc i32
@"\01??_9C@@$B3AE"(%struct.C* %this, i32, double)
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds i32 (%struct.C*, i32,
double)** %{{.*}}, i64 1
// CHECK32: [[CALLEE:%.*]] = load i32 (%struct.C*, i32, double)** [[VPTR]]
// CHECK32: [[CALL:%.*]] = call x86_thiscallcc i32 [[CALLEE]](%struct.C*
%{{.*}}, i32 %{{.*}}, double %{{.*}})
// CHECK32: ret i32 [[CALL]]
// CHECK32: }
//
-// CHECK64-LABEL: define linkonce_odr i32 @"\01??_9C@@$B7AA"(%struct.C* %this,
i32, double) unnamed_addr
+// CHECK64-LABEL: define linkonce_odr i32 @"\01??_9C@@$B7AA"(%struct.C* %this,
i32, double)
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds i32 (%struct.C*, i32,
double)** %{{.*}}, i64 1
// CHECK64: [[CALLEE:%.*]] = load i32 (%struct.C*, i32, double)** [[VPTR]]
// CHECK64: [[CALL:%.*]] = call i32 [[CALLEE]](%struct.C* %{{.*}}, i32
%{{.*}}, double %{{.*}})
@@ -95,14 +97,14 @@ void f() {
// CHECK64: }
// Thunk for calling the 3rd virtual function in C, taking an int parameter,
returning a struct.
-// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void
@"\01??_9C@@$B7AE"(%struct.C* %this, %struct.S* noalias sret %agg.result, i32)
unnamed_addr
+// CHECK32-LABEL: define linkonce_odr x86_thiscallcc void
@"\01??_9C@@$B7AE"(%struct.C* %this, %struct.S* noalias sret %agg.result, i32)
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*,
%struct.S*, i32)** %{{.*}}, i64 2
// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, i32)** [[VPTR]]
// CHECK32: call x86_thiscallcc void [[CALLEE]](%struct.C* %{{.*}}, %struct.S*
sret %agg.result, i32 %{{.*}})
// CHECK32: ret void
// CHECK32: }
//
-// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBA@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, i32) unnamed_addr
+// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBA@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, i32)
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*,
%struct.S*, i32)** %{{.*}}, i64 2
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, i32)** [[VPTR]]
// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret
%agg.result, i32 %{{.*}})
@@ -110,14 +112,14 @@ void f() {
// CHECK64: }
// Thunk for calling the virtual function in internal class D.
-// CHECK32-LABEL: define internal x86_thiscallcc void
@"\01??_9D@?A@@$BA@AE"(%"struct.(anonymous namespace)::D"* %this) unnamed_addr
+// CHECK32-LABEL: define internal x86_thiscallcc void
@"\01??_9D@?A@@$BA@AE"(%"struct.(anonymous namespace)::D"* %this)
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%"struct.(anonymous
namespace)::D"*)** %{{.*}}, i64 0
// CHECK32: [[CALLEE:%.*]] = load void (%"struct.(anonymous namespace)::D"*)**
[[VPTR]]
// CHECK32: call x86_thiscallcc void [[CALLEE]](%"struct.(anonymous
namespace)::D"* %{{.*}})
// CHECK32: ret void
// CHECK32: }
//
-// CHECK64-LABEL: define internal void
@"\01??_9D@?A@@$BA@AA"(%"struct.(anonymous namespace)::D"* %this) unnamed_addr
+// CHECK64-LABEL: define internal void
@"\01??_9D@?A@@$BA@AA"(%"struct.(anonymous namespace)::D"* %this)
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%"struct.(anonymous
namespace)::D"*)** %{{.*}}, i64 0
// CHECK64: [[CALLEE:%.*]] = load void (%"struct.(anonymous namespace)::D"*)**
[[VPTR]]
// CHECK64: call void [[CALLEE]](%"struct.(anonymous namespace)::D"* %{{.*}})
@@ -126,14 +128,14 @@ void f() {
// Thunk for calling the fourth virtual function in C, taking a struct
parameter
// and returning a struct.
-// CHECK32-LABEL: define linkonce_odr x86_thiscallcc %struct.S*
@"\01??_9C@@$BM@AE"(%struct.C* %this, <{ %struct.S*, %struct.U }>* inalloca)
unnamed_addr
+// CHECK32-LABEL: define linkonce_odr x86_thiscallcc %struct.S*
@"\01??_9C@@$BM@AE"(%struct.C* %this, <{ %struct.S*, %struct.U }>* inalloca)
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds %struct.S* (%struct.C*, <{
%struct.S*, %struct.U }>*)** %{{.*}}, i64 3
// CHECK32: [[CALLEE:%.*]] = load %struct.S* (%struct.C*, <{ %struct.S*,
%struct.U }>*)** [[VPTR]]
// CHECK32: [[CALL:%.*]] = musttail call x86_thiscallcc %struct.S*
[[CALLEE]](%struct.C* %{{.*}}, <{ %struct.S*, %struct.U }>* inalloca %{{.*}})
// CHECK32-NEXT: ret %struct.S* [[CALL]]
// CHECK32: }
//
-// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBI@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, %struct.U*) unnamed_addr
+// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BBI@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, %struct.U*)
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*,
%struct.S*, %struct.U*)** %{{.*}}, i64 3
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, %struct.U*)**
[[VPTR]]
// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret
%agg.result, %struct.U* %{{.*}})
@@ -142,14 +144,14 @@ void f() {
// Thunk for calling the fifth virtual function in C, taking a struct parameter
// and returning a struct.
-// 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
+// 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)
// CHECK32: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*,
%struct.S*, <{ %struct.U }>*)** %{{.*}}, i64 4
// CHECK32: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, <{ %struct.U
}>*)** [[VPTR]]
// CHECK32: musttail call x86_fastcallcc void [[CALLEE]](%struct.C* inreg
%{{.*}}, %struct.S* inreg sret %{{.*}}, <{ %struct.U }>* inalloca %{{.*}})
// CHECK32-NEXT: ret void
// CHECK32: }
//
-// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BCA@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, %struct.U*) unnamed_addr
+// CHECK64-LABEL: define linkonce_odr void @"\01??_9C@@$BCA@AA"(%struct.C*
%this, %struct.S* noalias sret %agg.result, %struct.U*)
// CHECK64: [[VPTR:%.*]] = getelementptr inbounds void (%struct.C*,
%struct.S*, %struct.U*)** %{{.*}}, i64 4
// CHECK64: [[CALLEE:%.*]] = load void (%struct.C*, %struct.S*, %struct.U*)**
[[VPTR]]
// CHECK64: call void [[CALLEE]](%struct.C* %{{.*}}, %struct.S* sret
%agg.result, %struct.U* %{{.*}})
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
