diff options
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Execution.cpp | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Interpreter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 565915bb5a..fe80dfddd6 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -1307,7 +1307,7 @@ void Interpreter::visitAShr(BinaryOperator &I) { #define INTEGER_ASSIGN(DEST, BITWIDTH, VAL) \ { \ - uint64_t Mask = (1ull << BITWIDTH) - 1; \ + uint64_t Mask = ~(uint64_t)(0ull) >> (64-BITWIDTH); \ if (BITWIDTH == 1) { \ Dest.Int1Val = (bool) (VAL & Mask); \ } else if (BITWIDTH <= 8) { \ diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h index a8deb01b21..aef4cb23b1 100644 --- a/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -236,7 +236,7 @@ private: // Helper functions }; inline void maskToBitWidth(GenericValue& GV, unsigned BitWidth) { - uint64_t BitMask = (1ull << BitWidth) - 1; + uint64_t BitMask = ~(uint64_t)(0ull) >> (64-BitWidth); if (BitWidth <= 8) GV.Int8Val &= BitMask; else if (BitWidth <= 16) |