Skip to content

release/20.x: [C++20] [Modules] Don't diagnose duplicated declarations in different modules which is not in file scope #126685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
+41 −0
Merged

release/20.x: [C++20] [Modules] Don't diagnose duplicated declarations in different modules which is not in file scope #126685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions clang/lib/Serialization/ASTReaderDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3751,6 +3751,13 @@ void ASTDeclReader::checkMultipleDefinitionInNamedModules(ASTReader &Reader,
if (D->getFriendObjectKind() || Previous->getFriendObjectKind())
return;

// Skip diagnosing in-class declarations.
if (!Previous->getLexicalDeclContext()
->getNonTransparentContext()
->isFileContext() ||
!D->getLexicalDeclContext()->getNonTransparentContext()->isFileContext())
return;

Module *M = Previous->getOwningModule();
if (!M)
return;
Expand Down
34 changes: 34 additions & 0 deletions clang/test/Modules/pr126373.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: split-file %s %t
//
// RUN: %clang_cc1 -std=c++20 %t/module1.cppm -emit-module-interface -o %t/module1.pcm
// RUN: %clang_cc1 -std=c++20 -fmodule-file=module1=%t/module1.pcm %t/module2.cppm \
// RUN: -emit-module-interface -o %t/module2.pcm
// RUN: %clang_cc1 -std=c++20 %t/module2.pcm -fmodule-file=module1=%t/module1.pcm \
// RUN: -emit-llvm -o - | FileCheck %t/module2.cppm

//--- test.h
template<typename T>
struct Test {
template<typename U>
friend class Test;
};

//--- module1.cppm
module;
#include "test.h"
export module module1;
export void f1(Test<int>) {}

//--- module2.cppm
module;
#include "test.h"
export module module2;
import module1;
export void f2(Test<float>) {}

extern "C" void func() {}

// Fine enough to check the IR is emitted correctly.
// CHECK: define{{.*}}@func
Loading