<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Fri, Jul 24, 2015 at 9:35 AM Frédéric Riss <<a href="mailto:friss@apple.com">friss@apple.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><blockquote type="cite"><div>On Jul 24, 2015, at 9:26 AM, Eric Christopher <<a href="mailto:echristo@gmail.com" target="_blank">echristo@gmail.com</a>> wrote:</div><br><div><div dir="ltr">The mach-o ness of this particular code is a little depressing. Any reason why?</div></div></blockquote><div><br></div></div></div><div style="word-wrap:break-word"><div><div>Because of the universal binaries. As we have fat files with multiple variants of</div><div>ARM, or x86_64, it’s important to get exact triples in the mach-o case. I still check</div><div>that arch in other cases, but it’s just a Triple.getArch() check that isn’t sufficient</div><div>to differentiate the variants.</div><div>Note that the mach-o specific getTriple() helper is used only in the mach-o specific</div><div>debug map parser.</div></div></div><div style="word-wrap:break-word"><div><br></div></div></blockquote><div><br></div><div>Guess I'll need to look through the code more. Something called "BinaryHolder" didn't scream "MachO specific thing". One more thing to add to the list.</div><div><br></div><div>-eric</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><blockquote type="cite"><div><div dir="ltr"><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Thu, Jul 23, 2015 at 11:46 PM Frederic Riss <<a href="mailto:friss@apple.com" target="_blank">friss@apple.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: friss<br>
Date: Fri Jul 24 01:41:04 2015<br>
New Revision: 243095<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D243095-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=Y-83XGVHWWrgB3XQThoFCcy-YifBDQG-GHYjZq072cc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=243095&view=rev</a><br>
Log:<br>
[dsymutil] Make the triple detection more strict.<br>
<br>
MachOObjectFile offers a method for detecting the correct triple, use<br>
it instead of the previous approximation. This doesn't matter right<br>
now, but it will become important for mach-o universal (fat) binaries.<br>
<br>
Modified:<br>
llvm/trunk/test/tools/dsymutil/X86/frame-1.test<br>
llvm/trunk/test/tools/dsymutil/X86/frame-2.test<br>
llvm/trunk/test/tools/dsymutil/X86/odr-1.test<br>
llvm/trunk/test/tools/dsymutil/archive-timestamp.test<br>
llvm/trunk/test/tools/dsymutil/debug-map-parsing.test<br>
llvm/trunk/test/tools/dsymutil/yaml-object-address-rewrite.test<br>
llvm/trunk/tools/dsymutil/BinaryHolder.cpp<br>
llvm/trunk/tools/dsymutil/BinaryHolder.h<br>
llvm/trunk/tools/dsymutil/MachODebugMapParser.cpp<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/frame-1.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_X86_frame-2D1.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=DffSMy-JuMm_bGZw8dltzyCEKeKH1iGGI52GJx9QFq4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/frame-1.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/frame-1.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/frame-1.test Fri Jul 24 01:41:04 2015<br>
@@ -9,7 +9,7 @@<br>
# link twice the same file using this made-up debug map:<br>
<br>
---<br>
-triple: 'i386-unknown-unknown-macho'<br>
+triple: 'i386-apple-darwin'<br>
objects:<br>
- filename: frame-dw2.o<br>
symbols:<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/frame-2.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_X86_frame-2D2.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=ouGg46Cxj2djUxpcB0OhG9tO_gRJ4O1QvLY9iUx7NzE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/frame-2.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/frame-2.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/frame-2.test Fri Jul 24 01:41:04 2015<br>
@@ -12,7 +12,7 @@<br>
# appears again. This is a behavior we inherited from dsymutil-classic<br>
# but this should be fixed (see comment in patchFrameInfoForObject())<br>
---<br>
-triple: 'i386-unknown-unknown-macho'<br>
+triple: 'i386-apple-darwin'<br>
objects:<br>
- filename: frame-dw2.o<br>
symbols:<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/odr-1.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_X86_odr-2D1.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=os4bDpwZ55TQUWFV6kGQGOhSAtRDVninvr3w0983izw&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/odr-1.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/odr-1.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/odr-1.test Fri Jul 24 01:41:04 2015<br>
@@ -14,7 +14,7 @@<br>
# Totally made up debug map to test ODR uniquing<br>
<br>
---<br>
-triple: 'x86_64-unknown-unknown-macho'<br>
+triple: 'x86_64-apple-darwin'<br>
objects:<br>
- filename: odr1.o<br>
symbols:<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/archive-timestamp.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_archive-2Dtimestamp.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=z0MlJ4xOS37FBd2lh9jwX86LSjDq8qydZEP7X9GgVmQ&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/archive-timestamp.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/archive-timestamp.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/archive-timestamp.test Fri Jul 24 01:41:04 2015<br>
@@ -6,7 +6,7 @@<br>
# CHECK: warning: {{.*}}libbasic.a(basic3.macho.x86_64.o): {{[Nn]o}} such file<br>
<br>
---<br>
-triple: 'x86_64-unknown-unknown-macho'<br>
+triple: 'x86_64-apple-darwin'<br>
objects:<br>
- filename: '/Inputs/libbasic.a(basic2.macho.x86_64.o)'<br>
timestamp: 141869239<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/debug-map-parsing.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_debug-2Dmap-2Dparsing.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=0qb67kB_orTvT4PS286fiKjZFCz7NWLL7YhrIjgR9eo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/debug-map-parsing.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/debug-map-parsing.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/debug-map-parsing.test Fri Jul 24 01:41:04 2015<br>
@@ -9,7 +9,7 @@ Check that We can parse the debug map of<br>
<br>
CHECK-NOT: error<br>
CHECK: ---<br>
-CHECK: triple: 'x86_64-unknown-unknown-macho'<br>
+CHECK: triple: 'x86_64-apple-darwin'<br>
CHECK: filename:{{.*}}/Inputs/basic1.macho.x86_64.o<br>
CHECK-DAG: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000EA0, size: 0x00000024<br>
CHECK: filename{{.*}}/Inputs/basic2.macho.x86_64.o<br>
@@ -28,7 +28,7 @@ Check that we can parse the debug-map of<br>
<br>
CHECK-LTO-NOT: error<br>
CHECK-LTO: ---<br>
-CHECK-LTO: triple: 'x86_64-unknown-unknown-macho'<br>
+CHECK-LTO: triple: 'x86_64-apple-darwin'<br>
CHECK-LTO: /Inputs/basic-lto.macho.x86_64.o<br>
CHECK-LTO-DAG: sym: _bar, objAddr: 0x0000000000000050, binAddr: 0x0000000100000F90, size: 0x00000024<br>
CHECK-LTO-DAG: sym: _baz, objAddr: 0x0000000000000658, binAddr: 0x0000000100001000, size: 0x00000000<br>
@@ -51,7 +51,7 @@ CHECK-ARCHIVE-NEXT: found member in cur<br>
CHECK-ARCHIVE-NEXT: trying to open {{.*}}/libbasic.a(basic3.macho.x86_64.o)'<br>
CHECK-ARCHIVE-NEXT: found member in current archive.<br>
CHECK-ARCHIVE: ---<br>
-CHECK-ARCHIVE: triple: 'x86_64-unknown-unknown-macho'<br>
+CHECK-ARCHIVE: triple: 'x86_64-apple-darwin'<br>
CHECK-ARCHIVE: /Inputs/basic1.macho.x86_64.o<br>
CHECK-ARCHIVE-DAG: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000EA0, size: 0x00000024<br>
CHECK-ARCHIVE: /Inputs/./libbasic.a(basic2.macho.x86_64.o)<br>
@@ -72,7 +72,7 @@ NOT-FOUND: cannot open{{.*}}"/Inputs/bas<br>
NOT-FOUND: cannot open{{.*}}"/Inputs/basic2.macho.x86_64.o": {{[Nn]o}} such file<br>
NOT-FOUND: cannot open{{.*}}"/Inputs/basic3.macho.x86_64.o": {{[Nn]o}} such file<br>
NOT-FOUND: ---<br>
-NOT-FOUND-NEXT: triple: 'x86_64-unknown-unknown-macho'<br>
+NOT-FOUND-NEXT: triple: 'x86_64-apple-darwin'<br>
NOT-FOUND-NEXT: ...<br>
<br>
Check that we correctly error out on invalid executatble.<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/yaml-object-address-rewrite.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_tools_dsymutil_yaml-2Dobject-2Daddress-2Drewrite.test-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=xwxdT1Ow9bsnzIntTpkhDFt7Dee2DIdMHASCfqVoJqg&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/yaml-object-address-rewrite.test?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/yaml-object-address-rewrite.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/yaml-object-address-rewrite.test Fri Jul 24 01:41:04 2015<br>
@@ -5,7 +5,7 @@<br>
# rewrite these addresses to the right values.<br>
#<br>
# CHECK: ---<br>
-# CHECK-NEXT: triple:{{.*}}'x86_64-unknown-unknown-macho'<br>
+# CHECK-NEXT: triple:{{.*}}'x86_64-apple-darwin'<br>
# CHECK-NEXT: objects:<br>
# CHECK-NEXT: filename:{{.*}}/Inputs/basic1.macho.x86_64.o<br>
# CHECK-NEXT: timestamp: 0<br>
@@ -28,7 +28,7 @@<br>
# CHECK-NOT: { sym:<br>
# CHECK-NEXT: ...<br>
---<br>
-triple: 'x86_64-unknown-unknown-macho'<br>
+triple: 'x86_64-apple-darwin'<br>
objects:<br>
- filename: /Inputs/basic1.macho.x86_64.o<br>
symbols:<br>
<br>
Modified: llvm/trunk/tools/dsymutil/BinaryHolder.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_tools_dsymutil_BinaryHolder.cpp-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=G4s89yDq-C8Dx6VRErN7NHx7rm_z_LqNR1ctIz8Kwls&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/BinaryHolder.cpp?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/dsymutil/BinaryHolder.cpp (original)<br>
+++ llvm/trunk/tools/dsymutil/BinaryHolder.cpp Fri Jul 24 01:41:04 2015<br>
@@ -13,11 +13,21 @@<br>
//===----------------------------------------------------------------------===//<br>
<br>
#include "BinaryHolder.h"<br>
+#include "llvm/Object/MachO.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
<br>
namespace llvm {<br>
namespace dsymutil {<br>
<br>
+Triple BinaryHolder::getTriple(const object::MachOObjectFile &Obj) {<br>
+ // If a ThumbTriple is returned, use it instead of the standard<br>
+ // one. This is because the thumb triple always allows to create a<br>
+ // target, whereas the non-thumb one might not.<br>
+ Triple ThumbTriple;<br>
+ Triple T = Obj.getArch(nullptr, &ThumbTriple);<br>
+ return ThumbTriple.getArch() ? ThumbTriple : T;<br>
+}<br>
+<br>
void BinaryHolder::changeBackingMemoryBuffer(<br>
std::unique_ptr<MemoryBuffer> &&Buf) {<br>
CurrentArchive.reset();<br>
<br>
Modified: llvm/trunk/tools/dsymutil/BinaryHolder.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_tools_dsymutil_BinaryHolder.h-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=JHllPV3t_raZyKJZJdd9nl-YZLRTTPiurzm2hVPTMtM&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/BinaryHolder.h?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/dsymutil/BinaryHolder.h (original)<br>
+++ llvm/trunk/tools/dsymutil/BinaryHolder.h Fri Jul 24 01:41:04 2015<br>
@@ -14,6 +14,7 @@<br>
#ifndef LLVM_TOOLS_DSYMUTIL_BINARYHOLDER_H<br>
#define LLVM_TOOLS_DSYMUTIL_BINARYHOLDER_H<br>
<br>
+#include "llvm/ADT/Triple.h"<br>
#include "llvm/Object/Archive.h"<br>
#include "llvm/Object/Error.h"<br>
#include "llvm/Object/ObjectFile.h"<br>
@@ -108,6 +109,8 @@ public:<br>
template <typename ObjectFileType> const ObjectFileType &GetAs() {<br>
return cast<ObjectFileType>(*CurrentObjectFile);<br>
}<br>
+<br>
+ static Triple getTriple(const object::MachOObjectFile &Obj);<br>
};<br>
}<br>
}<br>
<br>
Modified: llvm/trunk/tools/dsymutil/MachODebugMapParser.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_tools_dsymutil_MachODebugMapParser.cpp-3Frev-3D243095-26r1-3D243094-26r2-3D243095-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=hS5aqC43D5cNy75mAcMLgcatQAUTkWyvaLaVK539GHE&s=Uiyuq93hyZtCkrYZEiCwsfoC7SZsQHSnWzotKQS-9yc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/MachODebugMapParser.cpp?rev=243095&r1=243094&r2=243095&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/dsymutil/MachODebugMapParser.cpp (original)<br>
+++ llvm/trunk/tools/dsymutil/MachODebugMapParser.cpp Fri Jul 24 01:41:04 2015<br>
@@ -103,13 +103,6 @@ void MachODebugMapParser::switchToNewDeb<br>
CurrentDebugMapObject = &Result->addDebugMapObject(Path, Timestamp);<br>
}<br>
<br>
-static Triple getTriple(const object::MachOObjectFile &Obj) {<br>
- Triple TheTriple("unknown-unknown-unknown");<br>
- TheTriple.setArch(Triple::ArchType(Obj.getArch()));<br>
- TheTriple.setObjectFormat(Triple::MachO);<br>
- return TheTriple;<br>
-}<br>
-<br>
/// This main parsing routine tries to open the main binary and if<br>
/// successful iterates over the STAB entries. The real parsing is<br>
/// done in handleStabSymbolTableEntry.<br>
@@ -120,7 +113,7 @@ ErrorOr<std::unique_ptr<DebugMap>> MachO<br>
<br>
const MachOObjectFile &MainBinary = *MainBinOrError;<br>
loadMainBinarySymbols();<br>
- Result = make_unique<DebugMap>(getTriple(MainBinary));<br>
+ Result = make_unique<DebugMap>(BinaryHolder::getTriple(MainBinary));<br>
MainBinaryStrings = MainBinary.getStringTableData();<br>
for (const SymbolRef &Symbol : MainBinary.symbols()) {<br>
const DataRefImpl &DRI = Symbol.getRawDataRefImpl();<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</div></blockquote></div></div></blockquote></div></div>