diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-09-01 20:35:42 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-09-01 20:35:42 +0000 |
| commit | d88a7f1a9281fd1d2675a8860cc1971dd5c9b93d (patch) | |
| tree | 83eb71fa9194cc31a24e531066b0645496d9d47a /clang/test/Modules/cxx-templates.cpp | |
| parent | 7f37775e56e24770edb30205c9cddae23a7754b4 (diff) | |
| download | bcm5719-llvm-d88a7f1a9281fd1d2675a8860cc1971dd5c9b93d.tar.gz bcm5719-llvm-d88a7f1a9281fd1d2675a8860cc1971dd5c9b93d.zip | |
Re-commit r246497 (and dependent changes r246524 and r246521), reverted in
r246546, with a workaround for an MSVC 2013 miscompile and an MSVC 2015
rejects-valid.
Original commit message:
[modules] Rework serialized DeclContext lookup table management. Instead of
walking the loaded ModuleFiles looking for lookup tables for the context, store
them all in one place, and merge them together if we find we have too many
(currently, more than 4). If we do merge, include the merged form in our
serialized lookup table, so that downstream readers never need to look at our
imports' tables.
This gives a huge performance improvement to builds with very large numbers of
modules (in some cases, more than a 2x speedup was observed).
llvm-svn: 246582
Diffstat (limited to 'clang/test/Modules/cxx-templates.cpp')
| -rw-r--r-- | clang/test/Modules/cxx-templates.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/clang/test/Modules/cxx-templates.cpp b/clang/test/Modules/cxx-templates.cpp index 8e91b8247f2..fd6b4f5a2b1 100644 --- a/clang/test/Modules/cxx-templates.cpp +++ b/clang/test/Modules/cxx-templates.cpp @@ -28,8 +28,8 @@ void g() { f<double>(1.0); f<int>(); f(); // expected-error {{no matching function}} - // expected-note@Inputs/cxx-templates-b.h:3 {{couldn't infer template argument}} - // expected-note@Inputs/cxx-templates-b.h:4 {{requires single argument}} + // expected-note@Inputs/cxx-templates-a.h:3 {{couldn't infer template argument}} + // expected-note@Inputs/cxx-templates-a.h:4 {{requires 1 argument}} N::f(0); N::f<double>(1.0); @@ -179,10 +179,14 @@ namespace Std { // CHECK-GLOBAL: DeclarationName 'f' // CHECK-GLOBAL-NEXT: |-FunctionTemplate {{.*}} 'f' +// CHECK-GLOBAL-NEXT: |-FunctionTemplate {{.*}} 'f' +// CHECK-GLOBAL-NEXT: |-FunctionTemplate {{.*}} 'f' // CHECK-GLOBAL-NEXT: `-FunctionTemplate {{.*}} 'f' // CHECK-NAMESPACE-N: DeclarationName 'f' // CHECK-NAMESPACE-N-NEXT: |-FunctionTemplate {{.*}} 'f' +// CHECK-NAMESPACE-N-NEXT: |-FunctionTemplate {{.*}} 'f' +// CHECK-NAMESPACE-N-NEXT: |-FunctionTemplate {{.*}} 'f' // CHECK-NAMESPACE-N-NEXT: `-FunctionTemplate {{.*}} 'f' // CHECK-DUMP: ClassTemplateDecl {{.*}} <{{.*[/\\]}}cxx-templates-common.h:1:1, {{.*}}> col:{{.*}} in cxx_templates_common SomeTemplate |
