[cfe-commits] r102921 - in /cfe/trunk: lib/CodeGen/CGExprAgg.cpp lib/CodeGen/CGExprConstant.cpp test/CodeGenCXX/member-function-pointers.cpp

[Douglas Gregor]

On May 3, 2010, at 9:05 AM, Anders Carlsson wrote:

> Author: andersca
> Date: Mon May  3 11:05:06 2010
> New Revision: 102921
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=102921&view=rev
> Log:
> When computing the address of a virtual member function pointer, use the pointer width instead of hardcoding for 64-bit.
> 
> Modified:
>    cfe/trunk/lib/CodeGen/CGExprAgg.cpp
>    cfe/trunk/lib/CodeGen/CGExprConstant.cpp
>    cfe/trunk/test/CodeGenCXX/member-function-pointers.cpp
> 
> Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprAgg.cpp?rev=102921&r1=102920&r2=102921&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGExprAgg.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp Mon May  3 11:05:06 2010
> @@ -335,11 +335,16 @@
>   if (MD->isVirtual()) {
>     int64_t Index = CGF.CGM.getVTables().getMethodVTableIndex(MD);
> 
> +    // FIXME: We shouldn't use / 8 here.
> +    uint64_t PointerWidthInBytes = 
> +      CGF.CGM.getContext().Target.getPointerWidth(0) / 8;
> +

Use ASTContext::getCharWidth()?


>     // Itanium C++ ABI 2.3:
>     //   For a non-virtual function, this field is a simple function pointer. 
>     //   For a virtual function, it is 1 plus the virtual table offset 
>     //   (in bytes) of the function, represented as a ptrdiff_t. 
> -    FuncPtr = llvm::ConstantInt::get(PtrDiffTy, (Index * 8) + 1);
> +    FuncPtr = llvm::ConstantInt::get(PtrDiffTy,
> +                                     (Index * PointerWidthInBytes) + 1);
>   } else {
>     const FunctionProtoType *FPT = MD->getType()->getAs<FunctionProtoType>();
>     const llvm::Type *Ty =
> 
> Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=102921&r1=102920&r2=102921&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Mon May  3 11:05:06 2010
> @@ -448,11 +448,16 @@
>     if (MD->isVirtual()) {
>       uint64_t Index = CGM.getVTables().getMethodVTableIndex(MD);
> 
> +      // FIXME: We shouldn't use / 8 here.
> +      uint64_t PointerWidthInBytes = 
> +        CGM.getContext().Target.getPointerWidth(0) / 8;
> +      

Use ASTContext::getCharWidth()?

>       // Itanium C++ ABI 2.3:
>       //   For a non-virtual function, this field is a simple function pointer. 
>       //   For a virtual function, it is 1 plus the virtual table offset 
>       //   (in bytes) of the function, represented as a ptrdiff_t. 
> -      Values[0] = llvm::ConstantInt::get(PtrDiffTy, (Index * 8) + 1);
> +      Values[0] = llvm::ConstantInt::get(PtrDiffTy, 
> +                                         (Index * PointerWidthInBytes) + 1);
>     } else {
>       const FunctionProtoType *FPT = MD->getType()->getAs<FunctionProtoType>();
>       const llvm::Type *Ty =
> 
> Modified: cfe/trunk/test/CodeGenCXX/member-function-pointers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/member-function-pointers.cpp?rev=102921&r1=102920&r2=102921&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/member-function-pointers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/member-function-pointers.cpp Mon May  3 11:05:06 2010
> @@ -1,4 +1,5 @@
> // RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i386-apple-darwin9 | FileCheck -check-prefix LP32 %s
> 
> struct A { int a; void f(); virtual void vf1(); virtual void vf2(); };
> struct B { int b; virtual void g(); };
> @@ -12,10 +13,12 @@
> // CHECK: @pa2 = global %0 { i64 ptrtoint (void (%struct.A*)* @_ZN1A1fEv to i64), i64 0 }, align 8
> void (A::*pa2)() = &A::f;
> 
> -// CHECK: @pa3 = global %0 { i64 1, i64 0 }, align 8
> +// CHECK:      @pa3 = global %0 { i64 1, i64 0 }, align 8
> +// CHECK-LP32: @pa3 = global %0 { i32 1, i32 0 }, align 4
> void (A::*pa3)() = &A::vf1;
> 
> -// CHECK: @pa4 = global %0 { i64 9, i64 0 }, align 8
> +// CHECK:      @pa4 = global %0 { i64 9, i64 0 }, align 8
> +// CHECK-LP32: @pa4 = global %0 { i32 5, i32 0 }, align 4
> void (A::*pa4)() = &A::vf2;
> 
> // CHECK: @pc2 = global %0 { i64 ptrtoint (void (%struct.A*)* @_ZN1A1fEv to i64), i64 16 }, align 8
> @@ -51,16 +54,24 @@
>   // CHECK: store i64 0, i64* [[pa2adj]]
>   void (A::*pa2)() = &A::f;
> 
> -  // CHECK: [[pa3ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 0 
> -  // CHECK: store i64 1, i64* [[pa3ptr]]
> -  // CHECK: [[pa3adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 1
> -  // CHECK: store i64 0, i64* [[pa3adj]]
> +  // CHECK:      [[pa3ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 0 
> +  // CHECK:      store i64 1, i64* [[pa3ptr]]
> +  // CHECK:      [[pa3adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 1
> +  // CHECK:      store i64 0, i64* [[pa3adj]]
> +  // CHECK-LP32: [[pa3ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 0 
> +  // CHECK-LP32: store i32 1, i32* [[pa3ptr]]
> +  // CHECK-LP32: [[pa3adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa3, i32 0, i32 1
> +  // CHECK-LP32: store i32 0, i32* [[pa3adj]]
>   void (A::*pa3)() = &A::vf1;
> 
> -  // CHECK: [[pa4ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 0 
> -  // CHECK: store i64 9, i64* [[pa4ptr]]
> -  // CHECK: [[pa4adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 1
> -  // CHECK: store i64 0, i64* [[pa4adj]]
> +  // CHECK:      [[pa4ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 0 
> +  // CHECK:      store i64 9, i64* [[pa4ptr]]
> +  // CHECK:      [[pa4adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 1
> +  // CHECK:      store i64 0, i64* [[pa4adj]]
> +  // CHECK-LP32: [[pa4ptr:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 0 
> +  // CHECK-LP32: store i32 5, i32* [[pa4ptr]]
> +  // CHECK-LP32: [[pa4adj:%[a-zA-Z0-9\.]+]] = getelementptr inbounds %0* %pa4, i32 0, i32 1
> +  // CHECK-LP32: store i32 0, i32* [[pa4adj]]
>   void (A::*pa4)() = &A::vf2;
> }
> 
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits