diff options
| author | Micah Villmow <villmow@gmail.com> | 2012-10-11 21:27:41 +0000 |
|---|---|---|
| committer | Micah Villmow <villmow@gmail.com> | 2012-10-11 21:27:41 +0000 |
| commit | fb384d61c78b60787ed65475d8403aee65023962 (patch) | |
| tree | 7bf869f21ac85ae4ddbeea3069784c88381bd07e /lib/ExecutionEngine/Interpreter | |
| parent | d9a3bad4487dee0b9ed1a0f5555dffe605826158 (diff) | |
| download | llvm-fb384d61c78b60787ed65475d8403aee65023962.tar.gz llvm-fb384d61c78b60787ed65475d8403aee65023962.tar.bz2 llvm-fb384d61c78b60787ed65475d8403aee65023962.tar.xz | |
Revert 165732 for further review.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/Interpreter')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Execution.cpp | 3 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 326bf79c58..5202b09165 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -1054,8 +1054,7 @@ GenericValue Interpreter::executeIntToPtrInst(Value *SrcVal, Type *DstTy, GenericValue Dest, Src = getOperandValue(SrcVal, SF); assert(DstTy->isPointerTy() && "Invalid PtrToInt instruction"); - unsigned AS = cast<PointerType>(DstTy)->getAddressSpace(); - uint32_t PtrSize = TD.getPointerSizeInBits(AS); + uint32_t PtrSize = TD.getPointerSizeInBits(); if (PtrSize != Src.IntVal.getBitWidth()) Src.IntVal = Src.IntVal.zextOrTrunc(PtrSize); diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index f58adbe1e1..e16e2d112a 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -376,7 +376,7 @@ GenericValue lle_X_sprintf(FunctionType *FT, case 'x': case 'X': if (HowLong >= 1) { if (HowLong == 1 && - TheInterpreter->getDataLayout()->getPointerSizeInBits(0) == 64 && + TheInterpreter->getDataLayout()->getPointerSizeInBits() == 64 && sizeof(long) < sizeof(int64_t)) { // Make sure we use %lld with a 64 bit argument because we might be // compiling LLI on a 32 bit compiler. |