Author: adrian
Date: Mon Aug 29 15:46:56 2016
New Revision: 280009
URL: http://llvm.org/viewvc/llvm-project?rev=280009&view=rev
Log:
Fix a bug preventing the cause of a module-out-of-date error from being printed
Modified:
cfe/trunk/lib/Serialization/ASTReader.cpp
cfe/trunk/test/Modules/explicit-build.cpp
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=280009&r1=280008&r2=280009&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Mon Aug 29 15:46:56 2016
@@ -3769,7 +3769,7 @@ ASTReader::ReadASTCore(StringRef FileNam
// Otherwise, return an error.
Diag(diag::err_module_file_out_of_date) << moduleKindForDiagnostic(Type)
- << FileName << ErrorStr.empty()
+ << FileName << !ErrorStr.empty()
<< ErrorStr;
return Failure;
}
Modified: cfe/trunk/test/Modules/explicit-build.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/explicit-build.cpp?rev=280009&r1=280008&r2=280009&view=diff
==============================================================================
--- cfe/trunk/test/Modules/explicit-build.cpp (original)
+++ cfe/trunk/test/Modules/explicit-build.cpp Mon Aug 29 15:46:56 2016
@@ -199,6 +199,6 @@
// RUN: -fmodule-file=%t/c.pcm \
// RUN: %s -DHAVE_A -DHAVE_B -DHAVE_C 2>&1 | FileCheck
--check-prefix=CHECK-MISMATCHED-B %s
//
-// CHECK-MISMATCHED-B: fatal error: module file '{{.*}}b.pcm' is out of
date and needs to be rebuilt
+// CHECK-MISMATCHED-B: fatal error: module file '{{.*}}b.pcm' is out of
date and needs to be rebuilt: module file out of date
// CHECK-MISMATCHED-B-NEXT: note: imported by module 'c'
// CHECK-MISMATCHED-B-NOT: note:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
