[PATCH] D53334: [Frontend/Modules] Show diagnostics on prebuilt module configuration mismatch too
David Blaikie via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 8 12:50:00 PST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL346439: [Frontend/Modules] Show diagnostics on prebuilt module configuration mismatch… (authored by dblaikie, committed by ).
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D53334?vs=173124&id=173212#toc
Repository:
rL LLVM
https://reviews.llvm.org/D53334
Files:
cfe/trunk/lib/Frontend/CompilerInstance.cpp
cfe/trunk/test/Modules/mismatch-diagnostics.cpp
Index: cfe/trunk/lib/Frontend/CompilerInstance.cpp
===================================================================
--- cfe/trunk/lib/Frontend/CompilerInstance.cpp
+++ cfe/trunk/lib/Frontend/CompilerInstance.cpp
@@ -1727,7 +1727,9 @@
// module cache, we don't know how to rebuild modules.
unsigned ARRFlags = Source == ModuleCache ?
ASTReader::ARR_OutOfDate | ASTReader::ARR_Missing :
- ASTReader::ARR_ConfigurationMismatch;
+ Source == PrebuiltModulePath ?
+ 0 :
+ ASTReader::ARR_ConfigurationMismatch;
switch (ModuleManager->ReadAST(ModuleFileName,
Source == PrebuiltModulePath
? serialization::MK_PrebuiltModule
Index: cfe/trunk/test/Modules/mismatch-diagnostics.cpp
===================================================================
--- cfe/trunk/test/Modules/mismatch-diagnostics.cpp
+++ cfe/trunk/test/Modules/mismatch-diagnostics.cpp
@@ -0,0 +1,22 @@
+// RUN: rm -rf %t
+// RUN: mkdir -p %t/prebuilt_modules
+//
+// RUN: %clang_cc1 -triple %itanium_abi_triple \
+// RUN: -fmodules-ts -fprebuilt-module-path=%t/prebuilt-modules \
+// RUN: -emit-module-interface -pthread -DBUILD_MODULE \
+// RUN: %s -o %t/prebuilt_modules/mismatching_module.pcm
+//
+// RUN: not %clang_cc1 -triple %itanium_abi_triple -fmodules-ts \
+// RUN: -fprebuilt-module-path=%t/prebuilt_modules -DCHECK_MISMATCH \
+// RUN: %s 2>&1 | FileCheck %s
+
+#ifdef BUILD_MODULE
+export module mismatching_module;
+#endif
+
+#ifdef CHECK_MISMATCH
+import mismatching_module;
+// CHECK: error: POSIX thread support was enabled in PCH file but is currently disabled
+// CHECK-NEXT: module file {{.*}}/mismatching_module.pcm cannot be loaded due to a configuration mismatch with the current compilation
+#endif
+
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53334.173212.patch
Type: text/x-patch
Size: 1970 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20181108/435e9c1d/attachment.bin>
More information about the cfe-commits
mailing list