<div dir="ltr">Any chance of using assembly for these test object files to make them more legible/maintainable?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Mar 22, 2021 at 6:37 PM Jonas Devlieghere via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Jonas Devlieghere<br>
Date: 2021-03-22T18:36:39-07:00<br>
New Revision: 3d6c7d6e8e449913aed81544e6c6900fa6ea40cd<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/3d6c7d6e8e449913aed81544e6c6900fa6ea40cd" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/3d6c7d6e8e449913aed81544e6c6900fa6ea40cd</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/3d6c7d6e8e449913aed81544e6c6900fa6ea40cd.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/3d6c7d6e8e449913aed81544e6c6900fa6ea40cd.diff</a><br>
<br>
LOG: [dsymutil] Fix spurious warnings for missing symbols with thinLTO<br>
<br>
Fix spurious warnings for missing symbols with thinLTO. The latter<br>
appends a unique suffix to avoid collisions for exported private<br>
symbols, resulting in dsymutil complaining it couldn't find the symbol<br>
in the object file.<br>
<br>
rdar://75434058<br>
<br>
Differential revision: <a href="https://reviews.llvm.org/D99125" rel="noreferrer" target="_blank">https://reviews.llvm.org/D99125</a><br>
<br>
Added: <br>
llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/bar.o<br>
llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foo.o<br>
llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foobar.dylib<br>
llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/0.x86_64.thinlto.o<br>
llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/1.x86_64.thinlto.o<br>
llvm/test/tools/dsymutil/X86/thinlto.test<br>
<br>
Modified: <br>
llvm/tools/dsymutil/MachODebugMapParser.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/bar.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/bar.o<br>
new file mode 100644<br>
index 000000000000..26d795f44e1a<br>
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/bar.o <br>
diff er<br>
<br>
diff --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foo.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foo.o<br>
new file mode 100644<br>
index 000000000000..b7dcab5c27ba<br>
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foo.o <br>
diff er<br>
<br>
diff --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foobar.dylib b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foobar.dylib<br>
new file mode 100755<br>
index 000000000000..75b22f377237<br>
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/foobar.dylib <br>
diff er<br>
<br>
diff --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/0.x86_64.thinlto.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/0.x86_64.thinlto.o<br>
new file mode 100644<br>
index 000000000000..119b9268e539<br>
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/0.x86_64.thinlto.o <br>
diff er<br>
<br>
diff --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/1.x86_64.thinlto.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/1.x86_64.thinlto.o<br>
new file mode 100644<br>
index 000000000000..1c207a7e8515<br>
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/thinlto/lto/1.x86_64.thinlto.o <br>
diff er<br>
<br>
diff --git a/llvm/test/tools/dsymutil/X86/thinlto.test b/llvm/test/tools/dsymutil/X86/thinlto.test<br>
new file mode 100644<br>
index 000000000000..ebd4068a5c12<br>
--- /dev/null<br>
+++ b/llvm/test/tools/dsymutil/X86/thinlto.test<br>
@@ -0,0 +1,24 @@<br>
+$ cat foo.cpp<br>
+struct nontrivial {<br>
+ nontrivial() { }<br>
+};<br>
+<br>
+void function2()<br>
+{<br>
+ static const nontrivial magic_static;<br>
+}<br>
+<br>
+$ cat bar.cpp<br>
+void function2();<br>
+<br>
+void function1()<br>
+{<br>
+ function2();<br>
+}<br>
+<br>
+$ xcrun clang++ -g -flto=thin -O2 foo.cpp bar.cpp -c<br>
+$ xcrun clang++ -flto=thin foo.o bar.o -Xlinker -object_path_lto -Xlinker lto -shared -o foobar.dylib<br>
+<br>
+RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/thinlto/foobar.dylib -o %t.dSYM 2>&1 | FileCheck %s --allow-empty<br>
+CHECK-NOT: could not find object file symbol for symbol __ZZ9function2vE12magic_static<br>
+CHECK-NOT: could not find object file symbol for symbol __ZGVZ9function2vE12magic_static<br>
<br>
diff --git a/llvm/tools/dsymutil/MachODebugMapParser.cpp b/llvm/tools/dsymutil/MachODebugMapParser.cpp<br>
index fccf2f5406a9..7d45b2f5e623 100644<br>
--- a/llvm/tools/dsymutil/MachODebugMapParser.cpp<br>
+++ b/llvm/tools/dsymutil/MachODebugMapParser.cpp<br>
@@ -462,6 +462,17 @@ void MachODebugMapParser::handleStabSymbolTableEntry(uint32_t StringIndex,<br>
}<br>
}<br>
<br>
+ // ThinLTO adds a unique suffix to exported private symbols.<br>
+ for (auto Iter = CurrentObjectAddresses.begin();<br>
+ Iter != CurrentObjectAddresses.end(); ++Iter) {<br>
+ llvm::StringRef SymbolName = Iter->getKey();<br>
+ auto Pos = SymbolName.rfind(".llvm.");<br>
+ if (Pos != llvm::StringRef::npos && SymbolName.substr(0, Pos) == Name) {<br>
+ ObjectSymIt = Iter;<br>
+ break;<br>
+ }<br>
+ }<br>
+<br>
if (ObjectSymIt == CurrentObjectAddresses.end()) {<br>
Warning("could not find object file symbol for symbol " + Twine(Name));<br>
return;<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>