[llvm] r267427 - dsymutil: Only warn about clang module DWO id mismatches in verbose mode.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Mon Apr 25 12:04:32 2016
New Revision: 267427

URL: http://llvm.org/viewvc/llvm-project?rev=267427&view=rev
Log:
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

Modified:
    llvm/trunk/test/tools/dsymutil/X86/mismatch.m
    llvm/trunk/tools/dsymutil/DwarfLinker.cpp

Modified: llvm/trunk/test/tools/dsymutil/X86/mismatch.m
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/mismatch.m?rev=267427&r1=267426&r2=267427&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/mismatch.m (original)
+++ llvm/trunk/test/tools/dsymutil/X86/mismatch.m Mon Apr 25 12:04:32 2016
@@ -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;

Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=267427&r1=267426&r2=267427&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Mon Apr 25 12:04:32 2016
@@ -3340,7 +3340,10 @@ void DwarfLinker::loadClangModule(String
                << " 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);