[llvm] r254017 - [RuntimeDyld] Fix a class of arithmetic errors introduced in r253918

[Sanjoy Das via llvm-commits]

Author: sanjoy
Date: Tue Nov 24 14:37:01 2015
New Revision: 254017

URL: http://llvm.org/viewvc/llvm-project?rev=254017&view=rev
Log:
[RuntimeDyld] Fix a class of arithmetic errors introduced in r253918

r253918 had refactored expressions like "A - B.Address + C" to "A -
B.getAddressWithOffset(C)".  This is incorrect, since the latter really
computes "A - B.Address - C".

None of the tests I can run locally on x86 broke due to this bug, but it
is the current suspect for breakage on the AArch64 buildbots.

Modified:
    llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp

Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=254017&r1=254016&r2=254017&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Tue Nov 24 14:37:01 2015
@@ -1259,13 +1259,13 @@ relocation_iterator RuntimeDyldELF::proc
                                 StubTargetAddr - Section.getAddress(),
                                 ELF::R_AARCH64_MOVW_UABS_G3, Value.Addend);
       RelocationEntry REmovk_g2(SectionID, StubTargetAddr -
-                                               Section.getAddressWithOffset(4),
+                                               Section.getAddress() + 4,
                                 ELF::R_AARCH64_MOVW_UABS_G2_NC, Value.Addend);
       RelocationEntry REmovk_g1(SectionID, StubTargetAddr -
-                                               Section.getAddressWithOffset(8),
+                                               Section.getAddress() + 8,
                                 ELF::R_AARCH64_MOVW_UABS_G1_NC, Value.Addend);
       RelocationEntry REmovk_g0(SectionID, StubTargetAddr -
-                                               Section.getAddressWithOffset(12),
+                                               Section.getAddress() + 12,
                                 ELF::R_AARCH64_MOVW_UABS_G0_NC, Value.Addend);
 
       if (Value.SymbolName) {
@@ -1364,7 +1364,7 @@ relocation_iterator RuntimeDyldELF::proc
         RelocationEntry REHi(SectionID, StubTargetAddr - Section.getAddress(),
                              ELF::R_MIPS_HI16, Value.Addend);
         RelocationEntry RELo(SectionID,
-                             StubTargetAddr - Section.getAddressWithOffset(4),
+                             StubTargetAddr - Section.getAddress() + 4,
                              ELF::R_MIPS_LO16, Value.Addend);
 
         if (Value.SymbolName) {