From f96d17b8864b9207f598ac372829f1dfad139f96 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 6 Dec 2010 19:55:05 +0000 Subject: [PATCH] Another use of getSymbolOffset. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121034 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MachObjectWriter.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index 60b38dc5211..82e95f5d71a 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -536,10 +536,14 @@ public: if (A_Base == B_Base && A_Base) report_fatal_error("unsupported relocation with identical base"); - Value += Layout.getSymbolAddress(&A_SD) - - (A_Base == NULL ? 0 : Layout.getSymbolAddress(A_Base)); - Value -= Layout.getSymbolAddress(&B_SD) - - (B_Base == NULL ? 0 : Layout.getSymbolAddress(B_Base)); + assert((A_Base == NULL) == (B_Base == NULL)); + assert(A_SD.getFragment()->getParent() == + B_SD.getFragment()->getParent()); + + Value += Layout.getSymbolOffset(&A_SD) - + (A_Base == NULL ? 0 : Layout.getSymbolOffset(A_Base)); + Value -= Layout.getSymbolOffset(&B_SD) - + (B_Base == NULL ? 0 : Layout.getSymbolOffset(B_Base)); if (A_Base) { Index = A_Base->getIndex();