mirror of
https://github.com/intel/llvm.git
synced 2026-01-23 16:06:39 +08:00
Recommit [Modules] Remove unnecessary check when generating name lookup table in ASTWriter
Close https://github.com/llvm/llvm-project/issues/61065. We will avoid writing the names from external AST naturally. But currently its check is often false positive since we may have already marked the declarations as external but DeclContext::hasNeedToReconcileExternalVisibleStorage would be false after reconciling. Tested with libcxx's modular build. This patch can improve 8% compilation time in an internal workloads. See the discussion in https://reviews.llvm.org/rG1e0709167f5edd330889f51bb203c458bdb5e359 to see the information for recommitting.
This commit is contained in:
@@ -514,7 +514,6 @@ private:
|
||||
void WriteTypeAbbrevs();
|
||||
void WriteType(QualType T);
|
||||
|
||||
bool isLookupResultExternal(StoredDeclsList &Result, DeclContext *DC);
|
||||
bool isLookupResultEntirelyExternal(StoredDeclsList &Result, DeclContext *DC);
|
||||
|
||||
void GenerateNameLookupTable(const DeclContext *DC,
|
||||
|
||||
@@ -3849,12 +3849,6 @@ public:
|
||||
|
||||
} // namespace
|
||||
|
||||
bool ASTWriter::isLookupResultExternal(StoredDeclsList &Result,
|
||||
DeclContext *DC) {
|
||||
return Result.hasExternalDecls() &&
|
||||
DC->hasNeedToReconcileExternalVisibleStorage();
|
||||
}
|
||||
|
||||
bool ASTWriter::isLookupResultEntirelyExternal(StoredDeclsList &Result,
|
||||
DeclContext *DC) {
|
||||
for (auto *D : Result.getLookupResult())
|
||||
@@ -3897,8 +3891,7 @@ ASTWriter::GenerateNameLookupTable(const DeclContext *ConstDC,
|
||||
// don't need to write an entry for the name at all. If we can't
|
||||
// write out a lookup set without performing more deserialization,
|
||||
// just skip this entry.
|
||||
if (isLookupResultExternal(Result, DC) &&
|
||||
isLookupResultEntirelyExternal(Result, DC))
|
||||
if (isLookupResultEntirelyExternal(Result, DC))
|
||||
continue;
|
||||
|
||||
// We also skip empty results. If any of the results could be external and
|
||||
|
||||
55
clang/test/Modules/pr61065.cppm
Normal file
55
clang/test/Modules/pr61065.cppm
Normal file
@@ -0,0 +1,55 @@
|
||||
// From https://github.com/llvm/llvm-project/issues/61065
|
||||
// RUN: rm -rf %t
|
||||
// RUN: mkdir -p %t
|
||||
// RUN: split-file %s %t
|
||||
//
|
||||
// RUN: %clang_cc1 -std=c++20 %t/a.cppm -emit-module-interface -o %t/a.pcm
|
||||
// RUN: %clang_cc1 -std=c++20 %t/b.cppm -emit-module-interface -o %t/b.pcm \
|
||||
// RUN: -fprebuilt-module-path=%t
|
||||
// RUN: %clang_cc1 -std=c++20 %t/c.cppm -emit-module-interface -o %t/c.pcm \
|
||||
// RUN: -fprebuilt-module-path=%t
|
||||
// RUN: %clang_cc1 -std=c++20 %t/d.cpp -fsyntax-only -verify -fprebuilt-module-path=%t
|
||||
|
||||
//--- a.cppm
|
||||
export module a;
|
||||
|
||||
struct base {
|
||||
base(int) {}
|
||||
};
|
||||
|
||||
export struct a : base {
|
||||
using base::base;
|
||||
};
|
||||
|
||||
//--- b.cppm
|
||||
export module b;
|
||||
|
||||
import a;
|
||||
|
||||
a b() {
|
||||
return a(1);
|
||||
}
|
||||
|
||||
//--- c.cppm
|
||||
export module c;
|
||||
|
||||
import a;
|
||||
import b;
|
||||
|
||||
struct noncopyable {
|
||||
noncopyable(noncopyable const &) = delete;
|
||||
noncopyable() = default;
|
||||
};
|
||||
|
||||
export struct c {
|
||||
noncopyable c0;
|
||||
a c1 = 43;
|
||||
c() = default;
|
||||
};
|
||||
|
||||
//--- d.cpp
|
||||
// expected-no-diagnostics
|
||||
import c;
|
||||
void d() {
|
||||
c _;
|
||||
}
|
||||
Reference in New Issue
Block a user