[llvm-commits] [llvm] r136855 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp test/MC/ELF/x86_64-reloc-sizetest.s

[Jason W Kim]

Author: jasonwkim
Date: Wed Aug  3 19:38:45 2011
New Revision: 136855

URL: http://llvm.org/viewvc/llvm-project?rev=136855&view=rev
Log:
Fix http://llvm.org/bugs/show_bug.cgi?id=10568
Move the reloc size assert into AsmBackend - where it is more apropos.

Added:
    llvm/trunk/test/MC/ELF/x86_64-reloc-sizetest.s
Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=136855&r1=136854&r2=136855&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Wed Aug  3 19:38:45 2011
@@ -1698,7 +1698,6 @@
       default: llvm_unreachable("invalid fixup kind!");
       case FK_Data_8: Type = ELF::R_X86_64_64; break;
       case X86::reloc_signed_4byte:
-        assert(isInt<32>(Target.getConstant()));
         switch (Modifier) {
         default:
           llvm_unreachable("Unimplemented");

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=136855&r1=136854&r2=136855&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Wed Aug  3 19:38:45 2011
@@ -93,6 +93,23 @@
 
     assert(Fixup.getOffset() + Size <= DataSize &&
            "Invalid fixup offset!");
+
+    // Check that the upper bits are either all 0 or all 1's
+    switch (Size) {
+    case 1: 
+      assert((isInt<8>(Value) || isUInt<8>(Value)) && 
+             "Value does not fit in a 1Byte Reloc");
+      break;
+    case 2: 
+      assert((isInt<16>(Value) || isUInt<16>(Value)) && 
+             "Value does not fit in a 2Byte Reloc");
+      break;
+    case 4:
+      assert((isInt<32>(Value) || isUInt<32>(Value)) && 
+             "Value does not fit in a 4Byte Reloc");
+      break;
+    }
+
     for (unsigned i = 0; i != Size; ++i)
       Data[Fixup.getOffset() + i] = uint8_t(Value >> (i * 8));
   }

Added: llvm/trunk/test/MC/ELF/x86_64-reloc-sizetest.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/x86_64-reloc-sizetest.s?rev=136855&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/x86_64-reloc-sizetest.s (added)
+++ llvm/trunk/test/MC/ELF/x86_64-reloc-sizetest.s Wed Aug  3 19:38:45 2011
@@ -0,0 +1,13 @@
+// RUN: llvm-mc -triple x86_64-linux-gnu -filetype=obj %s | elf-dump | FileCheck %s
+
+// Tests that relocation value fits in the provided size
+// Original bug http://llvm.org/bugs/show_bug.cgi?id=10568
+	
+L: movq $(L + 2147483648),%rax
+
+	
+// CHECK:          Relocation 0x00000000
+// CHECK-NEXT:     'r_offset', 0x00000003
+// CHECK-NEXT:     'r_sym'
+// CHECK-NEXT:     'r_type', 0x0000000b
+// CHECK-NEXT:     'r_addend', 0x80000000