Index: runtime/vm/constants_arm64.h |
diff --git a/runtime/vm/constants_arm64.h b/runtime/vm/constants_arm64.h |
index 542fd521f84ef780f9ccfd05a36e561b30d353d2..bafbc730d0a42cf53d566e17710bf167a19f4835 100644 |
--- a/runtime/vm/constants_arm64.h |
+++ b/runtime/vm/constants_arm64.h |
@@ -810,7 +810,7 @@ static inline uint64_t RotateRight(uint64_t value, |
uint8_t width) { |
ASSERT(width <= 64); |
rotate &= 63; |
- return ((value & ((1UL << rotate) - 1UL)) << (width - rotate)) | |
+ return ((value & ((1ULL << rotate) - 1ULL)) << (width - rotate)) | |
(value >> rotate); |
} |
@@ -820,7 +820,7 @@ static inline uint64_t RepeatBitsAcrossReg(uint8_t reg_size, |
ASSERT((width == 2) || (width == 4) || (width == 8) || (width == 16) || |
(width == 32)); |
ASSERT((reg_size == kWRegSizeInBits) || (reg_size == kXRegSizeInBits)); |
- uint64_t result = value & ((1UL << width) - 1UL); |
+ uint64_t result = value & ((1ULL << width) - 1ULL); |
for (unsigned i = width; i < reg_size; i *= 2) { |
result |= (result << i); |
} |
@@ -1087,7 +1087,7 @@ class Instr { |
if (imm_s == 0x3F) { |
return 0; |
} |
- uint64_t bits = (1UL << (imm_s + 1)) - 1; |
+ uint64_t bits = (1ULL << (imm_s + 1)) - 1; |
return RotateRight(bits, imm_r, 64); |
} else { |
if ((imm_s >> 1) == 0x1F) { |
@@ -1099,7 +1099,7 @@ class Instr { |
if ((imm_s & mask) == mask) { |
return 0; |
} |
- uint64_t bits = (1UL << ((imm_s & mask) + 1)) - 1; |
+ uint64_t bits = (1ULL << ((imm_s & mask) + 1)) - 1; |
return RepeatBitsAcrossReg( |
reg_size, RotateRight(bits, imm_r & mask, width), width); |
} |