Author: Dmitry Chernenkov Date: 2023-03-24T07:59:04Z New Revision: 3048c9e15498161572483e3d4b81c9c37bf2770f
URL: https://github.com/llvm/llvm-project/commit/3048c9e15498161572483e3d4b81c9c37bf2770f DIFF: https://github.com/llvm/llvm-project/commit/3048c9e15498161572483e3d4b81c9c37bf2770f.diff LOG: Revert "Recommit [Modules] Remove unnecessary check when generating name lookup table in ASTWriter" This reverts commit 25557aa38a0dab76f5b7a4518942f69d879693c0. Added: Modified: clang/include/clang/Serialization/ASTWriter.h clang/lib/Serialization/ASTWriter.cpp Removed: clang/test/Modules/pr61065.cppm ################################################################################ diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h index d31fa38b93825..09ee1744e8945 100644 --- a/clang/include/clang/Serialization/ASTWriter.h +++ b/clang/include/clang/Serialization/ASTWriter.h @@ -514,6 +514,7 @@ class ASTWriter : public ASTDeserializationListener, void WriteTypeAbbrevs(); void WriteType(QualType T); + bool isLookupResultExternal(StoredDeclsList &Result, DeclContext *DC); bool isLookupResultEntirelyExternal(StoredDeclsList &Result, DeclContext *DC); void GenerateNameLookupTable(const DeclContext *DC, diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 3e40812a9a0ba..31e44b52929f4 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -3849,6 +3849,12 @@ class ASTDeclContextNameLookupTrait { } // 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()) @@ -3891,7 +3897,8 @@ 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 (isLookupResultEntirelyExternal(Result, DC)) + if (isLookupResultExternal(Result, DC) && + isLookupResultEntirelyExternal(Result, DC)) continue; // We also skip empty results. If any of the results could be external and diff --git a/clang/test/Modules/pr61065.cppm b/clang/test/Modules/pr61065.cppm deleted file mode 100644 index 44fa3679974ad..0000000000000 --- a/clang/test/Modules/pr61065.cppm +++ /dev/null @@ -1,55 +0,0 @@ -// 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 _; -} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
