<div dir="ltr">Hi Hans,<div><br></div><div>This is a 3.6 release blocker, please merge it into the branch.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Feb 8, 2015 at 10:31 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Mon Feb  9 00:31:31 2015<br>
New Revision: 228565<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228565&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228565&view=rev</a><br>
Log:<br>
MC: Calculate intra-section symbol differences correctly for COFF<br>
<br>
This fixes PR22060.<br>
<br>
Modified:<br>
    llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp<br>
    llvm/trunk/test/MC/COFF/diff.s<br>
<br>
Modified: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=228565&r1=228564&r2=228565&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=228565&r1=228564&r2=228565&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp (original)<br>
+++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp Mon Feb  9 00:31:31 2015<br>
@@ -706,17 +706,22 @@ void WinCOFFObjectWriter::RecordRelocati<br>
     CrossSection = &Symbol.getSection() != &B->getSection();<br>
<br>
     // Offset of the symbol in the section<br>
-    int64_t a = Layout.getSymbolOffset(&B_SD);<br>
+    int64_t OffsetOfB = Layout.getSymbolOffset(&B_SD);<br>
<br>
-    // Offset of the relocation in the section<br>
-    int64_t b = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();<br>
-<br>
-    FixedValue = b - a;<br>
     // In the case where we have SymbA and SymB, we just need to store the delta<br>
     // between the two symbols.  Update FixedValue to account for the delta, and<br>
     // skip recording the relocation.<br>
-    if (!CrossSection)<br>
+    if (!CrossSection) {<br>
+      int64_t OffsetOfA = Layout.getSymbolOffset(&A_SD);<br>
+      FixedValue = (OffsetOfA - OffsetOfB) + Target.getConstant();<br>
       return;<br>
+    }<br>
+<br>
+    // Offset of the relocation in the section<br>
+    int64_t OffsetOfRelocation =<br>
+        Layout.getFragmentOffset(Fragment) + Fixup.getOffset();<br>
+<br>
+    FixedValue = OffsetOfRelocation - OffsetOfB;<br>
   } else {<br>
     FixedValue = Target.getConstant();<br>
   }<br>
<br>
Modified: llvm/trunk/test/MC/COFF/diff.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/COFF/diff.s?rev=228565&r1=228564&r2=228565&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/COFF/diff.s?rev=228565&r1=228564&r2=228565&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/COFF/diff.s (original)<br>
+++ llvm/trunk/test/MC/COFF/diff.s Mon Feb  9 00:31:31 2015<br>
@@ -1,5 +1,23 @@<br>
 // RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -s -sr -sd | FileCheck %s<br>
<br>
+.section baz, "xr"<br>
+       .def    X<br>
+       .scl    2;<br>
+       .type   32;<br>
+       .endef<br>
+       .globl  X<br>
+X:<br>
+       mov     Y-X+42, %eax<br>
+       retl<br>
+<br>
+       .def    Y<br>
+       .scl    2;<br>
+       .type   32;<br>
+       .endef<br>
+       .globl  Y<br>
+Y:<br>
+       retl<br>
+<br>
        .def     _foobar;<br>
        .scl    2;<br>
        .type   32;<br>
@@ -30,3 +48,10 @@ _rust_crate:<br>
 // CHECK:        SectionData (<br>
 // CHECK-NEXT:     0000: 00000000 00000000 1C000000 20000000<br>
 // CHECK-NEXT:   )<br>
+<br>
+// CHECK:        Name: baz<br>
+// CHECK:        Relocations [<br>
+// CHECK-NEXT:   ]<br>
+// CHECK:        SectionData (<br>
+// CHECK-NEXT:     0000: A1300000 00C3C3<br>
+// CHECK-NEXT:   )<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>