RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-11 07:18:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dsymutil] Don't try to load Swift ASTs as objects.

Browse Source 
With the threading refactoring, loading of object files happens before
checking whether we're dealing with a swift AST. While that's not an
issue per se, it causes a warning to be printed:

  warning: /path/to/a.swiftmodule: The file was not recognized as a valid object file
  note: while processing /path/to/a.swiftmodule

This suppresses the warning by checking for a Swift AST before
attempting to load is as an object file.

rdar://39240444

llvm-svn: 329553
This commit is contained in:
Jonas Devlieghere 2018-04-09 09:09:59 +00:00
parent e53b6af8c1
commit 396e6ea6d7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/tools/dsymutil/X86/swift-ast-x86_64.test
View File

@ -9,6 +9,7 @@ Compiled with:
ld swift-ast.o -add_ast_path Inputs/swift-ast.swiftmodule -arch x86_64 -lSystem -macosx_version_min 10.9.0
DSYMUTIL: filename:{{.*}}swift-ast.swiftmodule
DSYMUTIL-NOT: The file was not recognized as a valid object file
DSYMUTIL: DEBUG MAP OBJECT:{{.*}}swift-ast.swiftmodule
READOBJ: Name:{{.*}}__swift_ast

5
tools/dsymutil/DwarfLinker.cpp
View File

@ -1562,6 +1562,11 @@ private:
LinkContext(const DebugMap &Map, DwarfLinker &Linker, DebugMapObject &DMO,
bool Verbose = false)
: DMO(DMO), BinHolder(Verbose), RelocMgr(Linker) {
// Swift ASTs are not object files.
if (DMO.getType() == MachO::N_AST) {
ObjectFile = nullptr;
return;
}
auto ErrOrObj = Linker.loadObject(BinHolder, DMO, Map);
ObjectFile = ErrOrObj ? &*ErrOrObj : nullptr;
DwarfContext = ObjectFile ? DWARFContext::create(*ObjectFile) : nullptr;