[lld] r265847 - Fix a crash bug in --start-lib.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 8 13:49:31 PDT 2016
Author: ruiu
Date: Fri Apr 8 15:49:31 2016
New Revision: 265847
URL: http://llvm.org/viewvc/llvm-project?rev=265847&view=rev
Log:
Fix a crash bug in --start-lib.
Previously, Lazy symbols were created for undefined symbols even though
such symbols cannot be resolved by loading object files. This patch
fixes that bug.
Added:
lld/trunk/test/ELF/Inputs/start-lib1.s
lld/trunk/test/ELF/Inputs/start-lib2.s
Modified:
lld/trunk/ELF/InputFiles.cpp
lld/trunk/test/ELF/start-lib.s
Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=265847&r1=265846&r2=265847&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Fri Apr 8 15:49:31 2016
@@ -594,7 +594,8 @@ template <class ELFT> std::vector<String
StringRef StringTable = check(Obj.getStringTableForSymtab(Sec));
std::vector<StringRef> V;
for (const Elf_Sym &Sym : Syms.slice(FirstNonLocal))
- V.push_back(check(Sym.getName(StringTable)));
+ if (Sym.st_shndx != SHN_UNDEF)
+ V.push_back(check(Sym.getName(StringTable)));
return V;
}
return {};
@@ -608,6 +609,8 @@ std::vector<StringRef> LazyObjectFile::g
for (const BasicSymbolRef &Sym : Obj->symbols()) {
if (BitcodeFile::shouldSkip(Sym))
continue;
+ if (Sym.getFlags() == BasicSymbolRef::SF_Undefined)
+ continue;
SmallString<64> Name;
raw_svector_ostream OS(Name);
Sym.printName(OS);
@@ -616,7 +619,7 @@ std::vector<StringRef> LazyObjectFile::g
return V;
}
-// Returns a vector of globally-visible symbol names.
+// Returns a vector of globally-visible defined symbol names.
std::vector<StringRef> LazyObjectFile::getSymbols() {
if (isBitcode(this->MB))
return getBitcodeSymbols();
Added: lld/trunk/test/ELF/Inputs/start-lib1.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/start-lib1.s?rev=265847&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/start-lib1.s (added)
+++ lld/trunk/test/ELF/Inputs/start-lib1.s Fri Apr 8 15:49:31 2016
@@ -0,0 +1,3 @@
+.globl foo
+foo:
+ call bar
Added: lld/trunk/test/ELF/Inputs/start-lib2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/start-lib2.s?rev=265847&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/start-lib2.s (added)
+++ lld/trunk/test/ELF/Inputs/start-lib2.s Fri Apr 8 15:49:31 2016
@@ -0,0 +1,2 @@
+.globl bar
+bar:
Modified: lld/trunk/test/ELF/start-lib.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/start-lib.s?rev=265847&r1=265846&r2=265847&view=diff
==============================================================================
--- lld/trunk/test/ELF/start-lib.s (original)
+++ lld/trunk/test/ELF/start-lib.s Fri Apr 8 15:49:31 2016
@@ -2,15 +2,24 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-// RUN: %p/Inputs/whole-archive.s -o %t2.o
+// RUN: %p/Inputs/start-lib1.s -o %t2.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
+// RUN: %p/Inputs/start-lib2.s -o %t3.o
+
+// RUN: ld.lld -o %t3 %t1.o %t2.o %t3.o
+// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TEST1 %s
+// TEST1: Name: bar
+// TEST1: Name: foo
-// RUN: ld.lld -o %t3 %t1.o %t2.o
-// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
-// ADDED: Name: _bar
+// RUN: ld.lld -o %t3 %t1.o -u bar --start-lib %t2.o %t3.o
+// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TEST2 %s
+// TEST2: Name: bar
+// TEST2-NOT: Name: foo
-// RUN: ld.lld -o %t3 %t1.o --start-lib %t2.o
-// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=LIB %s
-// LIB-NOT: Name: _bar
+// RUN: ld.lld -o %t3 %t1.o --start-lib %t2.o %t3.o
+// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TEST3 %s
+// TEST3-NOT: Name: bar
+// TEST3-NOT: Name: foo
.globl _start
_start:
More information about the llvm-commits
mailing list