From: Reid Spencer <rspencer@reidspencer.com>
Date: Tue, 6 Mar 2007 03:46:41 +0000 (+0000)
Subject: Fix some thinko's in the last patch. PtrSize has to be in bits and we
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=576310512118071393e3f216e1fd4108b0823e56;p=oota-llvm.git

Fix some thinko's in the last patch. PtrSize has to be in bits and we
might need to zext not just trunc the value.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34955 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 4a0c58906a5..b19fa048cfd 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -1058,9 +1058,9 @@ GenericValue Interpreter::executeIntToPtrInst(Value *SrcVal, const Type *DstTy,
   GenericValue Dest, Src = getOperandValue(SrcVal, SF);
   assert(isa<PointerType>(DstTy) && "Invalid PtrToInt instruction");
 
-  uint32_t PtrSize = TD.getPointerSize();
+  uint32_t PtrSize = TD.getPointerSizeInBits();
   if (PtrSize != Src.IntVal.getBitWidth())
-    Src.IntVal = Src.IntVal.trunc(PtrSize);
+    Src.IntVal = Src.IntVal.zextOrTrunc(PtrSize);
 
   Dest.PointerVal = (PointerTy) Src.IntVal.getZExtValue();
   return Dest;