c457766c6d
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
135 lines
5.5 KiB
C++
135 lines
5.5 KiB
C++
// RUN: rm -rf %t
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -DTEXTUAL
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL -DEARLY_INDIRECT_INCLUDE
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -fmodule-feature use_defs_twice -DIMPORT_USE_2
|
|
|
|
// Trigger import of definitions, but don't make them visible.
|
|
#include "empty.h"
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
#include "indirect.h"
|
|
#endif
|
|
|
|
A pre_a;
|
|
#ifdef IMPORT_USE_2
|
|
// expected-error-re@-2 {{must be imported from one of {{.*}}stuff.use{{.*}}stuff.use-2}}
|
|
#elif EARLY_INDIRECT_INCLUDE
|
|
// expected-error@-4 {{must be imported from module 'merged-defs'}}
|
|
#else
|
|
// expected-error@-6 {{must be imported from module 'stuff.use'}}
|
|
#endif
|
|
// expected-note@defs.h:1 +{{here}}
|
|
extern class A pre_a2;
|
|
int pre_use_a = use_a(pre_a2); // expected-error 2{{'A' must be imported}} expected-error {{'use_a' must be imported}}
|
|
// expected-note@defs.h:2 +{{here}}
|
|
|
|
B::Inner2 pre_bi; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:4 +{{here}}
|
|
// expected-note@defs.h:17 +{{here}}
|
|
void pre_bfi(B b) { // expected-error +{{must be imported}}
|
|
b.f<int>(); // expected-error +{{}}
|
|
}
|
|
|
|
C_Base<1> pre_cb1; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:23 +{{here}}
|
|
C1 pre_c1; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:25 +{{here}}
|
|
C2 pre_c2; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:26 +{{here}}
|
|
|
|
D::X pre_dx; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:28 +{{here}}
|
|
// expected-note@defs.h:29 +{{here}}
|
|
int pre_use_dx = use_dx(pre_dx); // ignored; pre_dx is invalid
|
|
|
|
int pre_e = E(0); // expected-error {{must be imported}}
|
|
// expected-note@defs.h:32 +{{here}}
|
|
|
|
int pre_ff = F<int>().f(); // expected-error +{{must be imported}}
|
|
int pre_fg = F<int>().g<int>(); // expected-error +{{must be imported}} expected-error 2{{expected}}
|
|
// expected-note@defs.h:34 +{{here}}
|
|
|
|
G::A pre_ga // expected-error +{{must be imported}}
|
|
= G::a; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:49 +{{here}}
|
|
// expected-note@defs.h:50 +{{here}}
|
|
decltype(G::h) pre_gh = G::h; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:51 +{{here}}
|
|
|
|
int pre_h = H(); // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:56 +{{here}}
|
|
using pre_i = I<>; // expected-error +{{must be imported}}
|
|
// expected-note@defs.h:57 +{{here}}
|
|
|
|
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-2{{.*}}stuff.use}}
|
|
#elif EARLY_INDIRECT_INCLUDE
|
|
// expected-error@-4 {{default argument of 'J' must be imported from module 'merged-defs'}}
|
|
#else
|
|
// expected-error@-6 {{default argument of 'J' must be imported from module 'stuff.use'}}
|
|
#endif
|
|
// expected-note@defs.h:58 +{{here}}
|
|
|
|
ScopedEnum pre_scopedenum; // expected-error {{must be imported}}
|
|
// expected-note@defs.h:105 0-1{{here}}
|
|
// expected-note@defs.h:106 0-1{{here}}
|
|
enum ScopedEnum : int;
|
|
ScopedEnum pre_scopedenum_declared; // ok
|
|
|
|
// Make definitions from second module visible.
|
|
#ifdef TEXTUAL
|
|
#include "import-and-redefine.h"
|
|
#elif defined IMPORT_USE_2
|
|
#include "use-defs-2.h"
|
|
#else
|
|
#include "merged-defs.h"
|
|
#endif
|
|
|
|
A post_a;
|
|
int post_use_a = use_a(post_a);
|
|
B::Inner2 post_bi;
|
|
void post_bfi(B b) {
|
|
b.f<int>();
|
|
}
|
|
C_Base<1> post_cb1;
|
|
C1 c1;
|
|
C2 c2;
|
|
D::X post_dx;
|
|
int post_use_dx = use_dx(post_dx);
|
|
int post_e = E(0);
|
|
int post_ff = F<char>().f();
|
|
int post_fg = F<char>().g<int>();
|
|
G::A post_ga = G::a;
|
|
decltype(G::h) post_gh = G::h;
|
|
int post_h = H();
|
|
using post_i = I<>;
|
|
J<> post_j;
|
|
template<typename T, int N, template<typename> class K> struct J;
|
|
J<> post_j2;
|
|
FriendDefArg::Y<int> friend_def_arg;
|
|
FriendDefArg::D<> friend_def_arg_d;
|
|
int post_anon_x_n = Anon::X().n;
|
|
|
|
MergeFunctionTemplateSpecializations::X<int>::Q<char> xiqc;
|
|
|
|
#ifdef TEXTUAL
|
|
#include "use-defs.h"
|
|
void use_static_inline() { StaticInline::g({}); }
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
// expected-warning@-2 {{ambiguous use of internal linkage declaration 'g' defined in multiple modules}}
|
|
// expected-note@defs.h:71 {{declared here in module 'redef'}}
|
|
// expected-note@defs.h:71 {{declared here in module 'stuff.use'}}
|
|
#endif
|
|
int use_anon_enum = G::g;
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
// expected-warning@-2 3{{ambiguous use of internal linkage declaration 'g' defined in multiple modules}}
|
|
// FIXME: These notes are produced, but -verify can't match them?
|
|
// FIXME-note@defs.h:51 3{{declared here in module 'redef'}}
|
|
// FIXME-note@defs.h:51 3{{declared here in module 'stuff.use'}}
|
|
#endif
|
|
int use_named_enum = G::i;
|
|
#endif
|