diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-01-10 00:46:38 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-01-10 00:46:38 +0000 |
| commit | 7c8a7251162d7e5db51e3ff7350a186fc749cee6 (patch) | |
| tree | 06ef486c3159324db006b836ec5919f5655f518f /llvm/lib/ExecutionEngine | |
| parent | f44404407fa8ab1981b4904e180a0dc878d45464 (diff) | |
| download | bcm5719-llvm-7c8a7251162d7e5db51e3ff7350a186fc749cee6.tar.gz bcm5719-llvm-7c8a7251162d7e5db51e3ff7350a186fc749cee6.zip | |
Fix undefined behavior (shift of negative value) in RuntimeDyldMachOAArch64::encodeAddend.
Test Plan: regression test suite with/without UBSan.
Reviewers: lhames, ributzka
Subscribers: aemerson, llvm-commits
Differential Revision: http://reviews.llvm.org/D6908
llvm-svn: 225568
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h index 274c5523011..196fa62a0a0 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h @@ -183,8 +183,8 @@ public: assert(isInt<33>(Addend) && "Invalid page reloc value."); // Encode the addend into the instruction. - uint32_t ImmLoValue = (uint32_t)(Addend << 17) & 0x60000000; - uint32_t ImmHiValue = (uint32_t)(Addend >> 9) & 0x00FFFFE0; + uint32_t ImmLoValue = ((uint64_t)Addend << 17) & 0x60000000; + uint32_t ImmHiValue = ((uint64_t)Addend >> 9) & 0x00FFFFE0; *p = (*p & 0x9F00001F) | ImmHiValue | ImmLoValue; break; } |
