diff options
| -rw-r--r-- | llvm/test/tools/llvm-nm/X86/archive-no-llvm-bc.test | 15 | ||||
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 14 |
2 files changed, 23 insertions, 6 deletions
diff --git a/llvm/test/tools/llvm-nm/X86/archive-no-llvm-bc.test b/llvm/test/tools/llvm-nm/X86/archive-no-llvm-bc.test new file mode 100644 index 00000000000..d2c0d3676d8 --- /dev/null +++ b/llvm/test/tools/llvm-nm/X86/archive-no-llvm-bc.test @@ -0,0 +1,15 @@ +; RUN: rm -rf %t && mkdir -p %t +; RUN: grep -v "module asm" %s | llvm-as -o %t/embedded.bc +; RUN: llc -I=%t -filetype=obj -o %t/obj.o %s +; RUN: llvm-ar crs %t/lib.a %t/obj.o +; RUN: llvm-nm -m -no-llvm-bc %t/lib.a | FileCheck %s + +target triple = "x86_64-apple-macosx10.11" + +@q = global i32 1, align 4 +; CHECK-NOT: {{-+}} (LTO,DATA) external _q +; CHECK: {{[[:xdigit:]]+}} (__DATA,__data) external _q + +module asm ".section __LLVM,__bitcode" +module asm ".incbin \22embedded.bc\22" + diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 7c009297139..a7346d56f32 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -1737,8 +1737,9 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { return; LLVMContext Context; - Expected<std::unique_ptr<Binary>> BinaryOrErr = createBinary( - BufferOrErr.get()->getMemBufferRef(), NoLLVMBitcode ? nullptr : &Context); + LLVMContext *ContextPtr = NoLLVMBitcode ? nullptr : &Context; + Expected<std::unique_ptr<Binary>> BinaryOrErr = + createBinary(BufferOrErr.get()->getMemBufferRef(), ContextPtr); if (!BinaryOrErr) { error(BinaryOrErr.takeError(), Filename); return; @@ -1772,7 +1773,8 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { { Error Err = Error::success(); for (auto &C : A->children(Err)) { - Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(&Context); + Expected<std::unique_ptr<Binary>> ChildOrErr = + C.getAsBinary(ContextPtr); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) error(std::move(E), Filename, C); @@ -1843,7 +1845,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { Error Err = Error::success(); for (auto &C : A->children(Err)) { Expected<std::unique_ptr<Binary>> ChildOrErr = - C.getAsBinary(&Context); + C.getAsBinary(ContextPtr); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) { @@ -1914,7 +1916,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { Error Err = Error::success(); for (auto &C : A->children(Err)) { Expected<std::unique_ptr<Binary>> ChildOrErr = - C.getAsBinary(&Context); + C.getAsBinary(ContextPtr); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) @@ -1981,7 +1983,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { Error Err = Error::success(); for (auto &C : A->children(Err)) { Expected<std::unique_ptr<Binary>> ChildOrErr = - C.getAsBinary(&Context); + C.getAsBinary(ContextPtr); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) |
