From 4f103e956157515dd800951f73ed550b1a0477f4 Mon Sep 17 00:00:00 2001 From: Chuanqi Xu Date: Tue, 21 Dec 2021 17:36:50 +0800 Subject: [PATCH] [NFC] [C++20] [Modules] Add tests for template instantiation in transitively imported module This commit adds two test about template class instantiation in transitively imported module. They are used as pre-commit tests for successive patches. --- .../module-transtive-instantiation/Templ.cppm | 8 ++++++++ .../Inputs/module-transtive-instantiation/bar.cppm | 6 ++++++ .../Modules/module-transtive-instantiation-2.cpp | 11 +++++++++++ .../test/Modules/module-transtive-instantiation.cpp | 13 +++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 clang/test/Modules/Inputs/module-transtive-instantiation/Templ.cppm create mode 100644 clang/test/Modules/Inputs/module-transtive-instantiation/bar.cppm create mode 100644 clang/test/Modules/module-transtive-instantiation-2.cpp create mode 100644 clang/test/Modules/module-transtive-instantiation.cpp diff --git a/clang/test/Modules/Inputs/module-transtive-instantiation/Templ.cppm b/clang/test/Modules/Inputs/module-transtive-instantiation/Templ.cppm new file mode 100644 index 000000000000..ee41b5374613 --- /dev/null +++ b/clang/test/Modules/Inputs/module-transtive-instantiation/Templ.cppm @@ -0,0 +1,8 @@ +export module Templ; +export template +class G { +public: + T operator()() { + return T(); + } +}; diff --git a/clang/test/Modules/Inputs/module-transtive-instantiation/bar.cppm b/clang/test/Modules/Inputs/module-transtive-instantiation/bar.cppm new file mode 100644 index 000000000000..63cd595a642d --- /dev/null +++ b/clang/test/Modules/Inputs/module-transtive-instantiation/bar.cppm @@ -0,0 +1,6 @@ +export module bar; +import Templ; +export template +int bar() { + return G()(); +} diff --git a/clang/test/Modules/module-transtive-instantiation-2.cpp b/clang/test/Modules/module-transtive-instantiation-2.cpp new file mode 100644 index 000000000000..647971776aa1 --- /dev/null +++ b/clang/test/Modules/module-transtive-instantiation-2.cpp @@ -0,0 +1,11 @@ +// RUN: rm -rf %t +// RUN: mkdir -p %t +// RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/Templ.cppm --precompile -o %t/Templ.pcm +// RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/bar.cppm --precompile -fprebuilt-module-path=%t -o %t/bar.pcm +// RUN: %clang -std=c++20 -fprebuilt-module-path=%t %s -c -Xclang -verify + +import bar; +int foo() { + G g; // expected-error {{declaration of 'G' must be imported from module 'Templ' before it is required}} + return g(); // expected-note@Inputs/module-transtive-instantiation/Templ.cppm:3 {{declaration here is not visible}} +} diff --git a/clang/test/Modules/module-transtive-instantiation.cpp b/clang/test/Modules/module-transtive-instantiation.cpp new file mode 100644 index 000000000000..4c095bfbbce6 --- /dev/null +++ b/clang/test/Modules/module-transtive-instantiation.cpp @@ -0,0 +1,13 @@ +// RUN: rm -rf %t +// RUN: mkdir -p %t +// RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/Templ.cppm --precompile -o %t/Templ.pcm +// RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/bar.cppm --precompile -fprebuilt-module-path=%t -o %t/bar.pcm +// RUN: %clang -std=c++20 -fprebuilt-module-path=%t %s -c -Xclang -verify + +import bar; +int foo() { + // FIXME: It shouldn't be an error. Since the `G` is already imported in bar. + return bar(); // expected-error@Inputs/module-transtive-instantiation/bar.cppm:5 {{definition of 'G' must be imported from module 'Templ' before it is required}} + // expected-note@-1 {{in instantiation of function template specialization 'bar' requested here}} + // expected-note@Inputs/module-transtive-instantiation/Templ.cppm:3 {{definition here is not reachable}} +}