diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-05-18 02:29:20 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-05-18 02:29:20 +0000 |
| commit | aaaa0b61427c26fec9adc47951a39d0367ce65e1 (patch) | |
| tree | 28a290a9eb5547cf42c709bf7501db090e65b8fa /test/SemaCXX/modules-ts.cppm | |
| parent | d665e952bdf8d103e4d1765d80d81e28369617d3 (diff) | |
| download | clang-aaaa0b61427c26fec9adc47951a39d0367ce65e1.tar.gz | |
[modules] Switch from inferring owning modules based on source location to
inferring based on the current module at the point of creation.
This should result in no functional change except when building a preprocessed
module (or more generally when using #pragma clang module begin/end to switch
module in the middle of a file), in which case it allows us to correctly track
the owning module for declarations. We can't map from FileID to module in the
preprocessed module case, since all modules would have the same FileID.
There are still a couple of remaining places that try to infer a module from a
source location; I'll clean those up in follow-up changes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@303322 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/modules-ts.cppm')
| -rw-r--r-- | test/SemaCXX/modules-ts.cppm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/SemaCXX/modules-ts.cppm b/test/SemaCXX/modules-ts.cppm index d1d7aaa96e..29122ec7da 100644 --- a/test/SemaCXX/modules-ts.cppm +++ b/test/SemaCXX/modules-ts.cppm @@ -18,7 +18,8 @@ int n; #if TEST >= 2 // expected-error@-2 {{redefinition of '}} // expected-note@-3 {{unguarded header; consider using #ifdef guards or #pragma once}} -// expected-note-re@modules-ts.cppm:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site here}} +// FIXME: We should drop the "header from" in this diagnostic. +// expected-note-re@modules-ts.cppm:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site in header from module 'foo'}} #endif #if TEST == 0 |