From 11c938d1227feb41c34c614c91fae2a30d9fbfaf Mon Sep 17 00:00:00 2001 From: Nathan Slingerland Date: Tue, 17 Nov 2015 23:37:09 +0000 Subject: [llvm-profdata] Show hint for other mismatch errors when merging instr profdata 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. llvm-svn: 253400 --- llvm/tools/llvm-profdata/llvm-profdata.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'llvm/tools/llvm-profdata/llvm-profdata.cpp') diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index f8499c30f66..52488af1c91 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -75,9 +75,13 @@ static void handleMergeWriterError(std::error_code &Error, StringRef Hint = ""; if (Error.category() == instrprof_category()) { instrprof_error instrError = static_cast(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; } } -- cgit v1.2.3