diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-09-12 02:13:47 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-09-12 02:13:47 +0000 |
| commit | c457766c6d739ba717f881b36a76ff60d3b75809 (patch) | |
| tree | 294731666a45d2531fbf35de0720e1585d01ccde /clang/test/Modules | |
| parent | 20fbdb347cf6324e6e8d3f4aa1d0b1ab02f70e8d (diff) | |
| download | bcm5719-llvm-c457766c6d739ba717f881b36a76ff60d3b75809.tar.gz bcm5719-llvm-c457766c6d739ba717f881b36a76ff60d3b75809.zip | |
Consistently create a new declaration when merging a pre-existing but
hidden definition with a would-be-parsed redefinition.
This permits a bunch of cleanups. In particular, we no longer need to
take merged definitions into account when checking declaration
visibility, only when checking definition visibility, which makes
certain visibility checks take linear instead of quadratic time.
We could also now remove the UPD_DECL_EXPORTED update record and track
on each declaration whether it was demoted from a definition (as we
already do for variables), but I'm not doing that in this patch to keep
the changes here simpler.
llvm-svn: 342018
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/submodules-merge-defs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index 4ab822a022b..795150208c9 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -65,7 +65,7 @@ using pre_i = I<>; // expected-error +{{must be imported}} J<> pre_j; // expected-error {{declaration of 'J' must be imported}} #ifdef IMPORT_USE_2 -// expected-error-re@-2 {{default argument of 'J' must be imported from one of {{.*}}stuff.use{{.*}}stuff.use-2}} +// expected-error-re@-2 {{default argument of 'J' must be imported from one of {{.*}}stuff.use-2{{.*}}stuff.use}} #elif EARLY_INDIRECT_INCLUDE // expected-error@-4 {{default argument of 'J' must be imported from module 'merged-defs'}} #else |
