summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/merge-var-template-def.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2016-10-13 23:04:14 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2016-10-13 23:04:14 +0000
commitb50df911788541fb5e17fe7cf3ce25330101a53a (patch)
tree5dfbd3ed0b7015b114563b7e54ae820b75cbfd36 /clang/test/Modules/merge-var-template-def.cpp
parent7705c4f1be36d8c3384f71b71fdd6751a49d7a70 (diff)
downloadbcm5719-llvm-b50df911788541fb5e17fe7cf3ce25330101a53a.tar.gz
bcm5719-llvm-b50df911788541fb5e17fe7cf3ce25330101a53a.zip
Reinstate r281429, reverted in r281452, with a fix for its mishandling of
compiles without -fmodules-local-submodule-visibility. Original commit message: [modules] When merging one definition into another, propagate the list of re-exporting modules from the discarded definition to the retained definition. llvm-svn: 284176
Diffstat (limited to 'clang/test/Modules/merge-var-template-def.cpp')
-rw-r--r--clang/test/Modules/merge-var-template-def.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/test/Modules/merge-var-template-def.cpp b/clang/test/Modules/merge-var-template-def.cpp
new file mode 100644
index 00000000000..4d39cad3103
--- /dev/null
+++ b/clang/test/Modules/merge-var-template-def.cpp
@@ -0,0 +1,7 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -I%S/Inputs/merge-var-template-def -verify -fmodules -Werror=undefined-internal -fmodules-local-submodule-visibility -fmodules-cache-path=%t -fimplicit-module-maps %s
+// expected-no-diagnostics
+
+#include "b2.h"
+namespace { struct X; }
+void *x = get<X>();
OpenPOWER on IntegriCloud