diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
| commit | 66f271497ed92ebb05c66f54616e512606a2e314 (patch) | |
| tree | 96d54cd64804ab7c9f2f52f680c3301aa789ce1d /lib/Support/DataExtractor.cpp | |
| parent | b62e9abf7dd9e39c95327914ce9dfe216386824a (diff) | |
| parent | bc363931085587bac42a40653962a3e5acd1ffce (diff) | |
Merge up to r162331, git commit bc363931085587bac42a40653962a3e5acd1ffce
Diffstat (limited to 'lib/Support/DataExtractor.cpp')
| -rw-r--r-- | lib/Support/DataExtractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Support/DataExtractor.cpp b/lib/Support/DataExtractor.cpp index dc21155a06..3d5cce0535 100644 --- a/lib/Support/DataExtractor.cpp +++ b/lib/Support/DataExtractor.cpp @@ -139,7 +139,7 @@ uint64_t DataExtractor::getULEB128(uint32_t *offset_ptr) const { while (isValidOffset(offset)) { byte = Data[offset++]; - result |= (byte & 0x7f) << shift; + result |= uint64_t(byte & 0x7f) << shift; shift += 7; if ((byte & 0x80) == 0) break; @@ -160,7 +160,7 @@ int64_t DataExtractor::getSLEB128(uint32_t *offset_ptr) const { while (isValidOffset(offset)) { byte = Data[offset++]; - result |= (byte & 0x7f) << shift; + result |= uint64_t(byte & 0x7f) << shift; shift += 7; if ((byte & 0x80) == 0) break; @@ -168,7 +168,7 @@ int64_t DataExtractor::getSLEB128(uint32_t *offset_ptr) const { // Sign bit of byte is 2nd high order bit (0x40) if (shift < 64 && (byte & 0x40)) - result |= -(1 << shift); + result |= -(1ULL << shift); *offset_ptr = offset; return result; |