-
Notifications
You must be signed in to change notification settings - Fork 60
Fix: JitCall codegen for deleted copy ctor in args #971
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
Open
Vipul-Cariappa
wants to merge
1
commit into
compiler-research:main
Choose a base branch
from
Vipul-Cariappa:dev/JitCall-deleted-copy-ctor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -2568,6 +2568,33 @@ | |||||||||||||||||||
| get_type_as_string(QT, type_name, C, Policy); | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| static bool IsCopyConstructorDeleted(QualType QT) { | ||||||||||||||||||||
| CXXRecordDecl* RD = QT->getAsCXXRecordDecl(); | ||||||||||||||||||||
| if (!RD) { | ||||||||||||||||||||
| // For types that are not C++ records (such as PODs), we assume that they | ||||||||||||||||||||
| // are copyable, ie their copy constructor is not deleted. | ||||||||||||||||||||
| return false; | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| RD = RD->getDefinition(); | ||||||||||||||||||||
| assert(RD && "expecting a definition"); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| if (RD->hasSimpleCopyConstructor()) | ||||||||||||||||||||
| return false; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| for (auto* Ctor : RD->ctors()) { | ||||||||||||||||||||
| if (Ctor->isCopyConstructor()) { | ||||||||||||||||||||
| return Ctor->isDeleted(); | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
Comment on lines
+2585
to
+2589
Contributor
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.
Suggested change
|
||||||||||||||||||||
|
|
||||||||||||||||||||
| assert(0 && "did not find a copy constructor?"); | ||||||||||||||||||||
| // Should never happen and the return value is somewhat arbitrary, but we did | ||||||||||||||||||||
| // not see a deleted copy ctor. The user will be told if the generated code | ||||||||||||||||||||
| // doesn't compile. | ||||||||||||||||||||
| return false; | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| void make_narg_ctor(const FunctionDecl* FD, const unsigned N, | ||||||||||||||||||||
| std::ostringstream& typedefbuf, std::ostringstream& callbuf, | ||||||||||||||||||||
| const std::string& class_name, int indent_level, | ||||||||||||||||||||
|
|
@@ -2612,7 +2639,18 @@ | |||||||||||||||||||
| } else if (isPointer) { | ||||||||||||||||||||
| callbuf << "*(" << type_name.c_str() << "**)args[" << i << "]"; | ||||||||||||||||||||
| } else { | ||||||||||||||||||||
| // By-value construction: Figure out if the type can be | ||||||||||||||||||||
| // copy-constructed. This is tricky and cannot be done in a fully | ||||||||||||||||||||
| // reliable way, also because std::vector<T> always defines a copy | ||||||||||||||||||||
| // constructor, even if the type T is only moveable. As a heuristic, we | ||||||||||||||||||||
| // only check if the copy constructor is deleted, or would be if | ||||||||||||||||||||
| // implicit. | ||||||||||||||||||||
| bool Move = IsCopyConstructorDeleted(QT); | ||||||||||||||||||||
| if (Move) | ||||||||||||||||||||
| callbuf << "static_cast<" << type_name << "&&>("; | ||||||||||||||||||||
| callbuf << "*(" << type_name.c_str() << "*)args[" << i << "]"; | ||||||||||||||||||||
| if (Move) | ||||||||||||||||||||
| callbuf << ")"; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
| callbuf << ")"; | ||||||||||||||||||||
|
|
||||||||||||||||||||
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
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.
We can add complete type call to the cppinterop interfaces which has probably a raii object as this operation might trigger deserialization.