summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2016-04-25 17:04:32 +0000
committerAdrian Prantl <aprantl@apple.com>2016-04-25 17:04:32 +0000
commit2c0b0ab62427a858920528e5cdd6394f218d8f04 (patch)
tree7826b6242294bd907720623250263b5d3c1661a7
parent43c7af68898b730650c6df957741471f9de0c72a (diff)
downloadbcm5719-llvm-2c0b0ab62427a858920528e5cdd6394f218d8f04.tar.gz
bcm5719-llvm-2c0b0ab62427a858920528e5cdd6394f218d8f04.zip
dsymutil: Only warn about clang module DWO id mismatches in verbose mode.
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 llvm-svn: 267427
-rw-r--r--llvm/test/tools/dsymutil/X86/mismatch.m2
-rw-r--r--llvm/tools/dsymutil/DwarfLinker.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/llvm/test/tools/dsymutil/X86/mismatch.m b/llvm/test/tools/dsymutil/X86/mismatch.m
index 33ae782df05..821097a31ba 100644
--- a/llvm/test/tools/dsymutil/X86/mismatch.m
+++ b/llvm/test/tools/dsymutil/X86/mismatch.m
@@ -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;
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index f560ec6075d..b93cac37c33 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -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);
OpenPOWER on IntegriCloud