aboutsummaryrefslogtreecommitdiff
path: root/lib/Analysis/ConstantFolding.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Analysis/ConstantFolding.cpp')
-rw-r--r--lib/Analysis/ConstantFolding.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 3294865a10..3030504961 100644
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -232,7 +232,7 @@ static Constant *FoldReinterpretLoadFromConstPtr(Constant *C,
}
unsigned BytesLoaded = (IntType->getBitWidth() + 7) / 8;
- if (BytesLoaded > 8 || BytesLoaded == 0) return 0;
+ if (BytesLoaded > 32 || BytesLoaded == 0) return 0;
GlobalValue *GVal;
int64_t Offset;
@@ -253,16 +253,18 @@ static Constant *FoldReinterpretLoadFromConstPtr(Constant *C,
if (uint64_t(Offset) >= TD.getTypeAllocSize(GV->getInitializer()->getType()))
return UndefValue::get(IntType);
- unsigned char RawBytes[8] = {0};
+ unsigned char RawBytes[32] = {0};
if (!ReadDataFromGlobal(GV->getInitializer(), Offset, RawBytes,
BytesLoaded, TD))
return 0;
- uint64_t ResultVal = 0;
- for (unsigned i = 0; i != BytesLoaded; ++i)
- ResultVal |= (uint64_t)RawBytes[i] << (i * 8);
+ APInt ResultVal(IntType->getBitWidth(), 0);
+ for (unsigned i = 0; i != BytesLoaded; ++i) {
+ ResultVal <<= 8;
+ ResultVal |= APInt(IntType->getBitWidth(), RawBytes[BytesLoaded-1-i]);
+ }
- return ConstantInt::get(IntType, ResultVal);
+ return ConstantInt::get(IntType->getContext(), ResultVal);
}
/// ConstantFoldLoadFromConstPtr - Return the value that a load from C would