aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/Expr/Expr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Expr/Expr.cpp')
-rw-r--r--lib/Expr/Expr.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp
index 2b9eab0d..50020fb1 100644
--- a/lib/Expr/Expr.cpp
+++ b/lib/Expr/Expr.cpp
@@ -343,13 +343,11 @@ ref<Expr> ConstantExpr::fromMemory(void *address, Width width) {
case Expr::Int64: return ConstantExpr::create(*((uint64_t*) address), width);
// FIXME: what about machines without x87 support?
default:
- return ConstantExpr::alloc(llvm::APInt(width,
-#if LLVM_VERSION_CODE >= LLVM_VERSION(5, 0)
- (width+llvm::APFloatBase::integerPartWidth-1)/llvm::APFloatBase::integerPartWidth,
-#else
- (width+llvm::integerPartWidth-1)/llvm::integerPartWidth,
-#endif
- (const uint64_t*)address));
+ return ConstantExpr::alloc(
+ llvm::APInt(width,
+ (width + llvm::APFloatBase::integerPartWidth - 1) /
+ llvm::APFloatBase::integerPartWidth,
+ (const uint64_t *)address));
}
}