mirror of
https://github.com/llvm/llvm-project.git
synced 2025-05-01 11:16:09 +00:00
49532137d0
With LLVM_APPEND_VC_REV=NO, Modules/merge-lifetime-extended-temporary.cpp would fail if it ran before a0f50d731639350c7a7 (which changed the serialization format) and then after, for these reasons: 1. With LLVM_APPEND_VC_REV=NO, the module hash before and after the change was the same. 2. Modules/merge-lifetime-extended-temporary.cpp is the only test we have that uses -fmodule-cache-path=%t that a) actually writes to the cache path b) doesn't do `rm -rf %t` at the top of the test So the old run would write a module file, and then the new run would try to load it, but the serialized format changed. Do several things to fix this: 1. Include clang::serialization::VERSION_MAJOR/VERSION_MINOR in the module hash, so that when the AST format changes (...and we remember to bump these), we use a different module cache dir. 2. Bump VERSION_MAJOR, since a0f50d731639350c7a7 changed the on-disk format in a way that a gch file written before that change can't be read after that change. 3. Add `rm -rf %t` to all tests that pass -fmodule-cache-path=%t. This is unnecessary from a correctness PoV after 1 and 2, but makes it so that we don't amass many cache dirs over time. (Arguably, it also makes it so that the test suite doesn't catch when we change the serialization format but don't bump clang::serialization::VERSION_MAJOR/VERSION_MINOR; oh well.) Differential Revision: https://reviews.llvm.org/D73202
31 lines
1.3 KiB
Plaintext
31 lines
1.3 KiB
Plaintext
// RUN: rm -rf %t
|
|
// RUN: not %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%S/Inputs/diagnostics-aux.modulemap -fmodule-map-file=%s -fsyntax-only -x c++ /dev/null 2>&1 | FileCheck %s --implicit-check-not error:
|
|
|
|
// CHECK: In file included from {{.*}}diagnostics-aux.modulemap:3:
|
|
// CHECK: diagnostics-aux-2.modulemap:2:3: error: expected
|
|
|
|
// PR22299: Ensure we can produce diagnostics for duplicate modules from -fmodule-map-file=.
|
|
//
|
|
// CHECK: diagnostics.modulemap:[[@LINE+2]]:8: error: redefinition of module 'foo'
|
|
// CHECK: diagnostics-aux.modulemap:1:8: note: previously defined here
|
|
module foo {}
|
|
|
|
//* Check that we accept BCPL comments properly, not just as an extension. */
|
|
|
|
module bad_use {
|
|
// CHECK: diagnostics.modulemap:[[@LINE+1]]:22: error: use declarations are only allowed in top-level modules
|
|
module submodule { use foo }
|
|
}
|
|
|
|
module header_attr {
|
|
// CHECK: diagnostics.modulemap:[[@LINE+1]]:20: error: expected a header attribute name
|
|
header "foo.h" { x }
|
|
// CHECK: diagnostics.modulemap:[[@LINE+1]]:27: error: header attribute 'size' specified multiple times
|
|
header "bar.h" { size 1 size 2 }
|
|
// CHECK: diagnostics.modulemap:[[@LINE+1]]:25: error: expected integer literal as value for header attribute 'size'
|
|
header "baz.h" { size "30 kilobytes" }
|
|
|
|
header "quux.h" { size 1 mtime 2 }
|
|
header "no_attrs.h" {}
|
|
}
|