[lld] r276296 - [ELF] - Fixed 3 testases failtures on win32 configuration.

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Thu Jul 21 08:35:06 PDT 2016


Author: grimar
Date: Thu Jul 21 10:35:06 2016
New Revision: 276296

URL: http://llvm.org/viewvc/llvm-project?rev=276296&view=rev
Log:
[ELF] - Fixed 3 testases failtures on win32 configuration.

Had 3 testcases failtures:
ELF/eh-frame-merge.s 
ELF/gc-sections-eh.s
ELF/gc-sections-lsda.s​

Problem was that OutputOff is size_t, which is 32
for this configuration and next
condition never was checked correctly:

if (PieceI->OutputOff == (uintX_t)-1)
  continue;


Modified:
    lld/trunk/ELF/Relocations.cpp

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=276296&r1=276295&r2=276296&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Thu Jul 21 10:35:06 2016
@@ -554,7 +554,7 @@ static void scanRelocs(InputSectionBase<
     uintX_t Offset;
     if (PieceI != PieceE) {
       assert(PieceI->InputOff <= RI.r_offset && "Relocation not in any piece");
-      if (PieceI->OutputOff == (uintX_t)-1)
+      if (PieceI->OutputOff == (size_t)-1)
         continue;
       Offset = PieceI->OutputOff + RI.r_offset - PieceI->InputOff;
     } else {




More information about the llvm-commits mailing list