Add support for generic expression evaluation in variadic generic con… #6505
Conversation
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
|
@swift-ci test |
augusto2112
reviewed
Mar 20, 2023
| @@ -864,7 +868,9 @@ swift::FuncDecl *SwiftASTManipulator::GetFunctionToInjectVariableInto( | |||
| // When not binding generic type parameters, we want to inject the metadata | |||
| // pointers in the wrapper, so we can pass them as opaque pointers in the | |||
| // trampoline function later on. | |||
| if (m_bind_generic_types == lldb::eDontBind && variable.IsMetadataPointer()) | |||
| if (m_bind_generic_types == lldb::eDontBind && | |||
There was a problem hiding this comment.
Are we relying in the same --bind-generic-types mechanism to enable this behavior? It seems to me this would never work in the "bind" mode.
| return {}; | ||
| return swift::Type(it->second); | ||
| } | ||
| //swift_ast_ctx->GetBuiltinRawPointerType()); |
| @@ -930,16 +950,20 @@ swift::VarDecl *SwiftASTManipulator::GetVarDeclForVariableInFunction( | |||
| const swift::Identifier name = variable.GetName(); | |||
| // We may need to mutate the self variable later, so hardcode it to a var | |||
| // in that case. | |||
| const auto introducer = variable.IsSelf() ? swift::VarDecl::Introducer::Var | |||
| : variable.GetVarIntroducer(); | |||
| const auto introducer = (variable.IsSelf() || variable.IsUnboundPack()) | |||
There was a problem hiding this comment.
I'm curious, why does the unbound pack need to be mutated?
| subs) { | ||
| auto tss = type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>(); | ||
| if (!tss) | ||
| return "<unexpected typesystem>"; |
There was a problem hiding this comment.
Maybe this function should return an llvm::Expected?
| @@ -64,58 +130,126 @@ struct CallsAndArgs { | |||
| /// - And a matching call to the sink function: | |||
| /// | |||
| /// lldb_sink($__lldb_arg, $__lldb_injected_self, $τ_0_0, $τ_0_1, ..., $τ_0_n) | |||
| static CallsAndArgs MakeGenericSignaturesAndCalls( | |||
| llvm::ArrayRef<SwiftASTManipulator::VariableInfo> local_variables) { | |||
| static llvm::Expected<CallsAndArgs> MakeGenericSignaturesAndCalls( | |||
There was a problem hiding this comment.
Update the doxygen comment explaining the new functionality and the new parameters?
| @@ -64,58 +130,126 @@ struct CallsAndArgs { | |||
| /// - And a matching call to the sink function: | |||
| /// | |||
| /// lldb_sink($__lldb_arg, $__lldb_injected_self, $τ_0_0, $τ_0_1, ..., $τ_0_n) | |||
| static CallsAndArgs MakeGenericSignaturesAndCalls( | |||
| llvm::ArrayRef<SwiftASTManipulator::VariableInfo> local_variables) { | |||
| static llvm::Expected<CallsAndArgs> MakeGenericSignaturesAndCalls( | |||
There was a problem hiding this comment.
This functions seems to be doing quite a lot now, and a lot of the new behavior depends on whether generic_sig exists and if needs_object_ptr is true/false, I wonder if it'd be possible to split it up in maybe 2,3 functions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…texts.