[llvm-commits] [dragonegg] r165738 - in /dragonegg/trunk/src: Convert.cpp DefaultABI.cpp

[Micah Villmow]

Author: mvillmow
Date: Thu Oct 11 15:03:21 2012
New Revision: 165738

URL: http://llvm.org/viewvc/llvm-project?rev=165738&view=rev
Log:
Fix an issue with dragonegg not building with recent LLVM api changes.

Modified:
    dragonegg/trunk/src/Convert.cpp
    dragonegg/trunk/src/DefaultABI.cpp

Modified: dragonegg/trunk/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Convert.cpp?rev=165738&r1=165737&r2=165738&view=diff
==============================================================================
--- dragonegg/trunk/src/Convert.cpp (original)
+++ dragonegg/trunk/src/Convert.cpp Thu Oct 11 15:03:21 2012
@@ -1839,7 +1839,9 @@
   if (EltTy->isPointerTy()) {
     // A pointer/vector of pointer - use inttoptr.
     assert(OrigEltTy->getPrimitiveSizeInBits() ==
-           TD.getPointerSizeInBits() && "Pointer type not same size!");
+           TD.getPointerSizeInBits(
+             cast<PointerType>(EltTy)->getAddressSpace())
+           && "Pointer type not same size!");
     return Builder.CreateIntToPtr(V, Ty);
   }
   // Everything else.

Modified: dragonegg/trunk/src/DefaultABI.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/DefaultABI.cpp?rev=165738&r1=165737&r2=165738&view=diff
==============================================================================
--- dragonegg/trunk/src/DefaultABI.cpp (original)
+++ dragonegg/trunk/src/DefaultABI.cpp Thu Oct 11 15:03:21 2012
@@ -428,7 +428,8 @@
   // that occupies storage but has no useful information, and is not passed
   // anywhere".  Happens on x86-64.
   std::vector<Type*> Elts(OrigElts);
-  Type* wordType = getDataLayout().getPointerSize() == 4 ?
+  unsigned AS = Ty->isPointerTy() ? cast<PointerType>(Ty)->getAddressSpace() : 0;
+  Type* wordType = getDataLayout().getPointerSize(AS) == 4 ?
     Type::getInt32Ty(getGlobalContext()) : Type::getInt64Ty(getGlobalContext());
   for (unsigned i=0, e=Elts.size(); i!=e; ++i)
     if (OrigElts[i]->isVoidTy())