[lld] r195109 - [PECOFF] Now that identify_magic() recognizes COFF import library.

Rui Ueyama ruiu at google.com
Mon Nov 18 22:29:57 PST 2013


Author: ruiu
Date: Tue Nov 19 00:29:57 2013
New Revision: 195109

URL: http://llvm.org/viewvc/llvm-project?rev=195109&view=rev
Log:
[PECOFF] Now that identify_magic() recognizes COFF import library.

No need to do that in ReaderCOFF.cpp.

Modified:
    lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp

Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=195109&r1=195108&r2=195109&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp Tue Nov 19 00:29:57 2013
@@ -758,7 +758,7 @@ public:
 
     if (fileType == llvm::sys::fs::file_magic::windows_resource)
       return convertAndParseResourceFile(mb, result);
-    if (isImportLibrary(magic))
+    if (fileType == llvm::sys::fs::file_magic::coff_import_library)
       return lld::coff::parseCOFFImportLibrary(_context, mb, result);
     return parseCOFFFile(mb, result);
   }
@@ -929,11 +929,6 @@ private:
     return error_code::success();
   }
 
-  static bool isImportLibrary(StringRef magic) {
-    return (magic[0] == 0          && magic[1] == 0 &&
-            magic[2] == (char)0xff && magic[3] == (char)0xff);
-  }
-
   PECOFFLinkingContext &_PECOFFLinkingContext;
   mutable BumpPtrStringSaver _stringSaver;
 };





More information about the llvm-commits mailing list