Skip to content

Commit

Permalink
dsymutil: Only warn about clang module DWO id mismatches in verbose m…
Browse files Browse the repository at this point in the history
…ode.

Until PR27449 (https://llvm.org/bugs/show_bug.cgi?id=27449) is fixed in
clang this warning is pointless, since ASTFileSignatures will change
randomly when a module is rebuilt.

rdar://problem/25610919

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@267427 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
adrian-prantl committed Apr 25, 2016
1 parent 16c04d1 commit cbea336
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/tools/dsymutil/X86/mismatch.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
-fdisable-module-hash mismatch.m -o /dev/null
*/

// RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/mismatch \
// RUN: llvm-dsymutil --verbose -f -oso-prepend-path=%p/../Inputs/mismatch \
// RUN: -y %p/dummy-debug-map.map -o %t.bin 2>&1 | FileCheck %s

@import mismatch;
Expand Down
5 changes: 4 additions & 1 deletion tools/dsymutil/DwarfLinker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3340,7 +3340,10 @@ void DwarfLinker::loadClangModule(StringRef Filename, StringRef ModulePath,
<< " 1 compile unit.\n";
exitDsymutil(1);
}
if (getDwoId(*CUDie, *CU) != DwoId)
// FIXME: Until PR27449 (https://llvm.org/bugs/show_bug.cgi?id=27449) is
// fixed in clang, only warn about DWO_id mismatches in verbose mode.
// ASTFileSignatures will change randomly when a module is rebuilt.
if (Options.Verbose && (getDwoId(*CUDie, *CU) != DwoId))
reportWarning(
Twine("hash mismatch: this object file was built against a "
"different version of the module ") + Filename);
Expand Down

0 comments on commit cbea336

Please sign in to comment.