OSDN Git Service

[llvm-profdata] Show hint for other mismatch errors when merging instr profdata
authorNathan Slingerland <slingn@gmail.com>
Tue, 17 Nov 2015 23:37:09 +0000 (23:37 +0000)
committerNathan Slingerland <slingn@gmail.com>
Tue, 17 Nov 2015 23:37:09 +0000 (23:37 +0000)
Missed bit of feedback from D14720.

Show the same "Make sure that all profile
data to be merged is generated from the same binary." hint for hash mismatch
and value site count mismatch as we now do for counter mismatch when merging
incompatible instrumentation profile data.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253400 91177308-0d34-0410-b5e6-96231b3b80d8

tools/llvm-profdata/llvm-profdata.cpp

index f8499c3..52488af 100644 (file)
@@ -75,9 +75,13 @@ static void handleMergeWriterError(std::error_code &Error,
     StringRef Hint = "";
     if (Error.category() == instrprof_category()) {
       instrprof_error instrError = static_cast<instrprof_error>(Error.value());
-      if (instrError == instrprof_error::count_mismatch) {
+      switch (instrError) {
+      case instrprof_error::hash_mismatch:
+      case instrprof_error::count_mismatch:
+      case instrprof_error::value_site_count_mismatch:
         Hint = "Make sure that all profile data to be merged is generated " \
                "from the same binary.";
+        break;
       }
     }