-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[C++20][modules] Fix std::initializer_list recognition if it's exported out of a module #118537
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d0a3059
Fix std::initializer_list recognition if it's exported out of a module
jijjijj 32e0611
Merge branch 'llvm:main' into 118218
jijjijj 932764c
Fix std::initializer_list recognition if it's exported out of a module
jijjijj 255c341
Merge branch 'main' into 118218
jijjijj 4b8c996
Fix few nits regarding std::initializer_list recognition if it's expo…
jijjijj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11927,7 +11927,7 @@ bool Sema::isStdInitializerList(QualType Ty, QualType *Element) { | |
if (TemplateClass->getIdentifier() != | ||
&PP.getIdentifierTable().get("initializer_list") || | ||
!getStdNamespace()->InEnclosingNamespaceSetOf( | ||
TemplateClass->getDeclContext())) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we can fix it by replacing |
||
TemplateClass->getNonTransparentDeclContext())) | ||
return false; | ||
// This is a template called std::initializer_list, but is it the right | ||
// template? | ||
|
39 changes: 39 additions & 0 deletions
39
clang/test/Modules/initializer-list-recognition-through-export-and-linkage-issue-118218.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
// RUN: rm -rf %t | ||
// RUN: mkdir -p %t | ||
// RUN: split-file %s %t | ||
// | ||
// RUN: %clang_cc1 -std=c++20 %t/std.cppm -emit-module-interface -o %t/std.pcm | ||
// RUN: %clang_cc1 -std=c++20 %t/mod.cppm -fprebuilt-module-path=%t -emit-module-interface -o %t/mod.pcm | ||
// RUN: %clang_cc1 -std=c++20 -fprebuilt-module-path=%t -verify %t/main.cpp | ||
|
||
//--- std.cppm | ||
export module std; | ||
|
||
extern "C++" { | ||
namespace std { | ||
export template <class E> | ||
class initializer_list { | ||
const E* _1; | ||
const E* _2; | ||
}; | ||
} | ||
} | ||
|
||
//--- mod.cppm | ||
export module mod; | ||
|
||
import std; | ||
|
||
export struct A { | ||
void func(std::initializer_list<int>) {} | ||
}; | ||
|
||
//--- main.cpp | ||
// expected-no-diagnostics | ||
import std; | ||
import mod; | ||
|
||
int main() { | ||
A{}.func({1,1}); | ||
return 0; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it is worth mentioning the pattern comes from MSVC's std module implementation.