
Following of https://github.com/llvm/llvm-project/pull/76930 This follows the idea of "only writes what we writes", which I think is the most natural and efficient way to implement this optimization. We start writing the BMI from the first declaration in module purview instead of the global module fragment, so that everything in the GMF untouched won't be written in the BMI naturally. The exception is, as I said in https://github.com/llvm/llvm-project/pull/76930, when we write a declaration we need to write its decl context, and when we write the decl context, we need to write everything from it. So when we see `std::vector`, we basically need to write everything under namespace std. This violates our intention. To fix this, this patch delays the writing of namespace in the GMF. From my local measurement, the size of the BMI decrease to 90M from 112M for a local modules build. I think this is significant. This feature will be covered under the experimental reduced BMI so that it won't affect any existing users. So I'd like to land this when the CI gets green. Documents will be added seperately.
64 lines
2.2 KiB
C++
64 lines
2.2 KiB
C++
// RUN: rm -fr %t
|
|
// RUN: mkdir %t
|
|
// RUN: split-file %s %t
|
|
//
|
|
// RUN: %clang_cc1 -std=c++20 %t/B.cppm -I%t -emit-module-interface -o %t/B.pcm
|
|
// RUN: %clang_cc1 -std=c++20 -fsyntax-only %t/A.cppm -I%t -fprebuilt-module-path=%t -verify
|
|
//
|
|
// RUN: %clang_cc1 -std=c++20 %t/D.cppm -I%t -emit-module-interface -o %t/D.pcm
|
|
// RUN: %clang_cc1 -std=c++20 -fsyntax-only %t/D-part.cppm -I%t -fprebuilt-module-path=%t -verify
|
|
|
|
// RUN: %clang_cc1 -std=c++20 %t/B.cppm -I%t -emit-reduced-module-interface -o %t/B.pcm
|
|
// RUN: %clang_cc1 -std=c++20 -fsyntax-only %t/A.cppm -I%t -fprebuilt-module-path=%t -verify
|
|
//
|
|
// RUN: %clang_cc1 -std=c++20 %t/D.cppm -I%t -emit-reduced-module-interface -o %t/D.pcm
|
|
// RUN: %clang_cc1 -std=c++20 -fsyntax-only %t/D-part.cppm -I%t -fprebuilt-module-path=%t -verify
|
|
|
|
//--- A.cppm
|
|
module;
|
|
export module baz:A;
|
|
import B;
|
|
#include "C.h"
|
|
|
|
//--- B.cppm
|
|
module;
|
|
|
|
#include "C.h"
|
|
export module B;
|
|
|
|
namespace foo {
|
|
export using foo::bar;
|
|
}
|
|
|
|
//--- C.h
|
|
namespace foo {
|
|
template<class T, class U> struct bar { // expected-error {{declaration of 'bar' in module baz:A follows declaration in the global module}} // expected-note {{previous declaration is here}}
|
|
template<class, class> bar(T, U);
|
|
};
|
|
template<class T, class U> bar(T, U) -> bar<T, U>; // expected-error {{declaration of '<deduction guide for bar>' in module baz:A follows declaration in the global module}} // expected-note {{previous declaration is here}}
|
|
}
|
|
|
|
//--- D.cppm
|
|
// Tests that it is still problematic if they are in one module.
|
|
module;
|
|
#include "E.h"
|
|
export module D;
|
|
|
|
namespace foo {
|
|
export using foo::bar;
|
|
}
|
|
|
|
//--- D-part.cppm
|
|
export module D:part;
|
|
import D;
|
|
#include "E.h"
|
|
|
|
//--- E.h
|
|
// another file for simpler diagnostics.
|
|
namespace foo {
|
|
template<class T, class U> struct bar { // expected-error {{declaration of 'bar' in module D:part follows declaration in the global module}} // expected-note {{previous declaration is here}}
|
|
template<class, class> bar(T, U);
|
|
};
|
|
template<class T, class U> bar(T, U) -> bar<T, U>; // expected-error {{declaration of '<deduction guide for bar>' in module D:part follows declaration in the global module}} // expected-note {{previous declaration is here}}
|
|
}
|