Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-05 23:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[C++20] [Modules] Only allow redeclarations in partitions if they are in the same module

Browse Source 
Closes https://github.com/llvm/llvm-project/issues/58196.

The root cause for the problem is an oversight in
https://reviews.llvm.org/D127624, which allows the redeclarations in
partitions. However, we took a mistake there that we should only allow
it if the redeclarations in the one same module instead of return
directly if either the redeclaration lives in a partition. The original
implementation makes no sense and I believe it was an oversight.
This commit is contained in:
Chuanqi Xu 2022-10-08 17:05:44 +08:00
parent 9974ed8049
commit 0c4f0bf40d
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Sema/SemaDecl.cpp
View File

@ -1660,9 +1660,11 @@ bool Sema::CheckRedeclarationModuleOwnership(NamedDecl *New, NamedDecl *Old) {
// Partitions are part of the module, but a partition could import another
// module, so verify that the PMIs agree.
if (NewM && OldM && (NewM->isModulePartition() || OldM->isModulePartition()))
return NewM->getPrimaryModuleInterfaceName() ==
OldM->getPrimaryModuleInterfaceName();
if (NewM && OldM &&
(NewM->isModulePartition() || OldM->isModulePartition()) &&
NewM->getPrimaryModuleInterfaceName() ==
OldM->getPrimaryModuleInterfaceName())
return false;
bool NewIsModuleInterface = NewM && NewM->isModulePurview();
bool OldIsModuleInterface = OldM && OldM->isModulePurview();

49
clang/test/Modules/inconsistent-deduction-guide-linkage.cppm Normal file
View File

@ -0,0 +1,49 @@
// 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
//--- A.cppm
module;
export module baz:A;
import B;
#include "C.h"
//--- B.cppm
module;
#include "C.h"
export module B;
//--- 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;
//--- 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}}
}