[llvm] r356718 - [Object] Fix reading objects created with -fembed-bitcode-marker

[Steven Wu via llvm-commits]

Author: steven_wu
Date: Thu Mar 21 14:01:31 2019
New Revision: 356718

URL: http://llvm.org/viewvc/llvm-project?rev=356718&view=rev
Log:
[Object] Fix reading objects created with -fembed-bitcode-marker

Currently, this fails with many tools, e.g.

$ clang -fembed-bitcode-marker -c -o test.o test.c
$ nm test.o
nm: test.o The file was not recognized as a valid object file

-fembed-bitcode-marker creates a LLVM,bitcode section consisting of a single
byte. When reading the object file, IRObjectFile::findBitcodeInObject succeeds,
causing SymbolicFile::createSymbolicFile to try to read the "bitcode" rather
than using the outer Mach-O data - when then fails.

Fix this by making findBitcodeInObject return an error if the section size <= 1.

Patched by: Nicholas Allegra

Differential Revision: https://reviews.llvm.org/D44373

Added:
    llvm/trunk/test/Object/Inputs/macho-bitcode-marker-x86_64.o
    llvm/trunk/test/Object/Inputs/macho-bitcode-x86_64.o
    llvm/trunk/test/Object/nm-bitcode.test
Modified:
    llvm/trunk/lib/Object/IRObjectFile.cpp

Modified: llvm/trunk/lib/Object/IRObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/IRObjectFile.cpp?rev=356718&r1=356717&r2=356718&view=diff
==============================================================================
--- llvm/trunk/lib/Object/IRObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/IRObjectFile.cpp Thu Mar 21 14:01:31 2019
@@ -78,6 +78,8 @@ IRObjectFile::findBitcodeInObject(const
       StringRef SecContents;
       if (std::error_code EC = Sec.getContents(SecContents))
         return errorCodeToError(EC);
+      if (SecContents.size() <= 1)
+        return errorCodeToError(object_error::bitcode_section_not_found);
       return MemoryBufferRef(SecContents, Obj.getFileName());
     }
   }

Added: llvm/trunk/test/Object/Inputs/macho-bitcode-marker-x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/macho-bitcode-marker-x86_64.o?rev=356718&view=auto
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/macho-bitcode-marker-x86_64.o (added) and llvm/trunk/test/Object/Inputs/macho-bitcode-marker-x86_64.o Thu Mar 21 14:01:31 2019 differ

Added: llvm/trunk/test/Object/Inputs/macho-bitcode-x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/macho-bitcode-x86_64.o?rev=356718&view=auto
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/macho-bitcode-x86_64.o (added) and llvm/trunk/test/Object/Inputs/macho-bitcode-x86_64.o Thu Mar 21 14:01:31 2019 differ

Added: llvm/trunk/test/Object/nm-bitcode.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-bitcode.test?rev=356718&view=auto
==============================================================================
--- llvm/trunk/test/Object/nm-bitcode.test (added)
+++ llvm/trunk/test/Object/nm-bitcode.test Thu Mar 21 14:01:31 2019
@@ -0,0 +1,12 @@
+# Inputs generated with:
+# echo 'int hello() { return 5; }' > test.c
+# clang -O -fembed-bitcode -c -o macho-bitcode-x86_64.o test.c
+# clang -O -fembed-bitcode-marker -c -o macho-bitcode-marker-x86_64.o test.c
+
+RUN: llvm-nm -a %p/Inputs/macho-bitcode-x86_64.o \
+RUN:         | FileCheck %s
+
+RUN: llvm-nm -a %p/Inputs/macho-bitcode-marker-x86_64.o \
+RUN:         | FileCheck %s
+
+CHECK: T _hello