diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-23 01:49:11 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-23 01:49:11 +0000 |
| commit | 1d209d075b6295eff2f87af107e27780d070f8b2 (patch) | |
| tree | 067527722a01f119b12846500f34ef314fa87463 /clang/test | |
| parent | 9c4f89ad2d6e232c8ad3023a236452fb36e1e00b (diff) | |
| download | bcm5719-llvm-1d209d075b6295eff2f87af107e27780d070f8b2.tar.gz bcm5719-llvm-1d209d075b6295eff2f87af107e27780d070f8b2.zip | |
Fix bitcode desynchronization when loading a PCH containing a class template
specialization with modules enabled. Just don't merge them at all for now;
we'll revisit this when support for template merging is added.
In passing, make Decl::dump() a little safer to use with PCH/modules, by making
it not deserialize any additional declarations. From a debugger you can call
decls_begin() or similar first if you want to dump all child decls.
llvm-svn: 182544
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/PCH/chain-cxx.cpp | 3 | ||||
| -rw-r--r-- | clang/test/PCH/chain-friend-instantiation.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/clang/test/PCH/chain-cxx.cpp b/clang/test/PCH/chain-cxx.cpp index 4b64f51143d..6e9c1743fbd 100644 --- a/clang/test/PCH/chain-cxx.cpp +++ b/clang/test/PCH/chain-cxx.cpp @@ -6,6 +6,9 @@ // With PCH // RUN: %clang_cc1 -fsyntax-only -verify %s -chain-include %s -chain-include %s +// With modules +// RUN: %clang_cc1 -fsyntax-only -verify -fmodules %s -chain-include %s -chain-include %s + // expected-no-diagnostics #ifndef HEADER1 diff --git a/clang/test/PCH/chain-friend-instantiation.cpp b/clang/test/PCH/chain-friend-instantiation.cpp index 294d9791123..2f042a8341e 100644 --- a/clang/test/PCH/chain-friend-instantiation.cpp +++ b/clang/test/PCH/chain-friend-instantiation.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 %s -ast-print -o - -chain-include %s -chain-include %s +// RUN: %clang_cc1 %s -ast-print -o - -fmodules -chain-include %s -chain-include %s #if !defined(PASS1) #define PASS1 |
