[Compile Time Constant Extraction] Extract result builder annotations #63091
Conversation
|
@swift-ci test |
lib/ConstExtract/ConstExtract.cpp
Outdated
| for (auto Member : Decl->getMembers()) { | ||
| if (auto *VD = dyn_cast<swift::VarDecl>(Member)) { | ||
| if (auto *attr = VD->getAttachedResultBuilder()) { | ||
| if (VD->getName() == VarDecl->getName()) { |
There was a problem hiding this comment.
@artemcm - Is checking equality by identifier the right thing to do here? It properly filtered in my testing.
There was a problem hiding this comment.
Yeah, those are uniqued by the ASTContext, so this should be safe. 👍🏼
lib/ConstExtract/ConstExtract.cpp
Outdated
| JSON.attribute("type", | ||
| toFullyQualifiedTypeNameString(attr->getType())); | ||
| writeFileInformation(JSON, VD->getASTContext(), attr); | ||
| }); |
There was a problem hiding this comment.
I likely want to break out of this loop when we see a result builder.
There was a problem hiding this comment.
Should be sufficient to break once we've seen a var decl with the name to the one we're looking for, result builder or no result builder, right?
There was a problem hiding this comment.
Yes. I think so.
| // CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift", | ||
| // CHECK-NEXT: "line": 24 |
There was a problem hiding this comment.
For inferred conformances, this is where the protocol is defined. Do we maybe not need file/line information since we have the var file/line above?
There was a problem hiding this comment.
My intuition is that we don't need file/line for the attribute at all, those are largely mostly relevant for the property decl itself. But perhaps I'm missing some use-case?
There was a problem hiding this comment.
Agreed. Removing.
jPaolantonio
force-pushed
the
const-extraction-result-builder
branch
from
bf3f0b6 to
d4c5ca6
Compare
|
@swift-ci test |
lib/ConstExtract/ConstExtract.cpp
Outdated
| for (auto Member : Decl->getMembers()) { | ||
| if (auto *VD = dyn_cast<swift::VarDecl>(Member)) { | ||
| if (auto *attr = VD->getAttachedResultBuilder()) { | ||
| if (VD->getName() == VarDecl->getName()) { |
There was a problem hiding this comment.
Nit: getAttachedResultBuilder fires off a request, so I think checking if the VD->getName() is the one we're looking for first could save some unnecessary work for all the other properties.
There was a problem hiding this comment.
Makes sense to me. I'll change that order and add the early return.
jPaolantonio
force-pushed
the
const-extraction-result-builder
branch
from
d4c5ca6 to
6bccd9f
Compare
|
@swift-ci test |
This PR extracts result builder type information for variables. This checks for both implicit and explicit (ie. protocol conformance) result builder annotations.