shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[C++20] [Modules] Don't diagnose duplicated friend declarations between modules incorrectly

Browse Source 
Close https://github.com/llvm/llvm-project/issues/125521

We shouldn't use the ownership information for friend declarations to do
anything.
This commit is contained in:
Chuanqi Xu 2025-02-05 13:41:48 +08:00
parent a47c35a699
commit c5a9a72b3c
3 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/AST/ASTContext.cpp
View File

@ -1055,7 +1055,8 @@ void ASTContext::PrintStats() const {
void ASTContext::mergeDefinitionIntoModule(NamedDecl *ND, Module *M,
bool NotifyListeners) {
if (NotifyListeners)
if (auto *Listener = getASTMutationListener())
if (auto *Listener = getASTMutationListener();
Listener && !ND->isUnconditionallyVisible())
Listener->RedefinedHiddenDefinition(ND, M);
MergedDefModules[cast<NamedDecl>(ND->getCanonicalDecl())].push_back(M);

5
clang/lib/Serialization/ASTReaderDecl.cpp
View File

@ -3746,6 +3746,11 @@ void ASTDeclReader::checkMultipleDefinitionInNamedModules(ASTReader &Reader,
Func && Func->getTemplateSpecializationInfo())
return;
// The module ownership of in-class friend declaration is not straightforward.
// Avoid diagnosing such cases.
if (D->getFriendObjectKind() || Previous->getFriendObjectKind())
return;
Module *M = Previous->getOwningModule();
if (!M)
return;

57
clang/test/Modules/pr125521.cppm Normal file
View File

@ -0,0 +1,57 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: split-file %s %t
//
// RUN: %clang_cc1 -std=c++20 %t/mod2.cppm -emit-module-interface -o %t/mod2.pcm
// RUN: %clang_cc1 -std=c++20 %t/mod1.cppm -emit-module-interface -o %t/mod1.pcm \
// RUN: -fmodule-file=Mod2=%t/mod2.pcm
// RUN: %clang_cc1 -std=c++20 %t/test.cc -fmodule-file=Mod2=%t/mod2.pcm -fmodule-file=Mod=%t/mod1.pcm \
// RUN: -fsyntax-only -verify
// RUN: %clang_cc1 -std=c++20 %t/mod2.cppm -emit-module-interface -o %t/mod2.pcm
// RUN: %clang_cc1 -std=c++20 %t/mod1.cppm -emit-module-interface -o %t/mod1.pcm \
// RUN: -fmodule-file=Mod2=%t/mod2.pcm
// RUN: %clang_cc1 -std=c++20 %t/mod1.pcm -fmodule-file=Mod2=%t/mod2.pcm -emit-llvm -o - \
// RUN: | FileCheck %t/mod1.cppm
//--- hello.h
template <typename V> int get() noexcept {return 0;};
template <typename T>
class List
{
template <typename V> friend int get() noexcept;
};
//--- mod2.cppm
module;
#include "hello.h"
export module Mod2;
export const char *modFn2() {
List<int> a;
return "hello";
}
//--- mod1.cppm
module;
#include "hello.h"
export module Mod;
import Mod2;
export extern "C" const char *modFn() {
List<int> a;
List<double> b;
return modFn2();
}
// Fine enough to check it won't crash.
// CHECK: define {{.*}}@modFn
//--- test.cc
// expected-no-diagnostics
import Mod;
import Mod2;
void test() {
modFn();
modFn2();
}