Skip to content

[Compile Time Constant Extraction] Extract result builder annotations #63091

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.

Sign up for GitHub

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 1 commit into from
Jan 20, 2023
+136 −1
Merged

[Compile Time Constant Extraction] Extract result builder annotations #63091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion lib/ConstExtract/ConstExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,14 +646,46 @@ void writeEnumCases(
});
}

void writeResultBuilderInformation(llvm::json::OStream &JSON,
const swift::NominalTypeDecl *TypeDecl,
const swift::VarDecl *VarDecl) {
if (auto *attr = VarDecl->getAttachedResultBuilder()) {
JSON.attributeObject("resultBuilder", [&] {
JSON.attribute("type", toFullyQualifiedTypeNameString(attr->getType()));
});

return;
}

for (ProtocolDecl *Decl :
TypeDecl->getLocalProtocols(ConformanceLookupKind::All)) {
for (auto Member : Decl->getMembers()) {
if (auto *VD = dyn_cast<swift::VarDecl>(Member)) {
if (VD->getName() != VarDecl->getName())
continue;

if (auto *attr = VD->getAttachedResultBuilder()) {
JSON.attributeObject("resultBuilder", [&] {
JSON.attribute("type",
toFullyQualifiedTypeNameString(attr->getType()));
});
}

return;
}
}
}
}

bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
llvm::raw_fd_ostream &OS) {
llvm::json::OStream JSON(OS, 2);
JSON.array([&] {
for (const auto &TypeInfo : ConstValueInfos) {
JSON.object([&] {
const auto *TypeDecl = TypeInfo.TypeDecl;
JSON.attribute("typeName", toFullyQualifiedTypeNameString(TypeDecl->getDeclaredInterfaceType()));
JSON.attribute("typeName", toFullyQualifiedTypeNameString(
TypeDecl->getDeclaredInterfaceType()));
JSON.attribute(
"kind",
TypeDecl->getDescriptiveKindName(TypeDecl->getDescriptiveKind())
Expand All @@ -672,6 +704,7 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
writeFileInformation(JSON, decl);
writeValue(JSON, PropertyInfo.Value);
writeAttributes(JSON, PropertyInfo.PropertyWrappers);
writeResultBuilderInformation(JSON, TypeDecl, decl);
});
}
});
Expand Down
102 changes: 102 additions & 0 deletions test/ConstExtraction/ExtractResultBuilders.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
// RUN: %empty-directory(%t)
// RUN: %empty-directory(%t/inputs)
// RUN: echo "[FooProvider]" > %t/inputs/protocols.json

// RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractResultBuilders.swiftconstvalues -const-gather-protocols-file %t/inputs/protocols.json -primary-file %s
// RUN: cat %t/ExtractResultBuilders.swiftconstvalues 2>&1 | %FileCheck %s

public struct Foo {
let name: String
}

@resultBuilder
public enum FooBuilder {
public static func buildExpression(_ component: Foo) -> Foo {
component
}

public static func buildBlock(_ components: Foo...) -> [Foo] {
components
}
}

public protocol FooProvider {
@FooBuilder
static var foos: [Foo] { get }
}

public struct MyFooProvider: FooProvider {
@FooBuilder
public static var foos: [Foo] {
Foo(name: "AAA")
Foo(name: "BBB")
}

@FooBuilder
public static var fooTwo: [Foo] {
Foo(name: "111")
Foo(name: "222")
}
}

public struct MyFooProviderInferred: FooProvider {
public static var foos: [Foo] {
Foo(name: "CCC")
Foo(name: "DDD")
}
}

// CHECK: [
// CHECK-NEXT: {
// CHECK-NEXT: "typeName": "ExtractResultBuilders.MyFooProvider",
// CHECK-NEXT: "kind": "struct",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift",
// CHECK-NEXT: "line": 28,
// CHECK-NEXT: "properties": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "foos",
// CHECK-NEXT: "type": "[ExtractResultBuilders.Foo]",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift",
// CHECK-NEXT: "line": 30,
// CHECK-NEXT: "valueKind": "Runtime",
// CHECK-NEXT: "resultBuilder": {
// CHECK-NEXT: "type": "ExtractResultBuilders.FooBuilder"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "fooTwo",
// CHECK-NEXT: "type": "[ExtractResultBuilders.Foo]",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift",
// CHECK-NEXT: "line": 36,
// CHECK-NEXT: "valueKind": "Runtime",
// CHECK-NEXT: "resultBuilder": {
// CHECK-NEXT: "type": "ExtractResultBuilders.FooBuilder"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "typeName": "ExtractResultBuilders.MyFooProviderInferred",
// CHECK-NEXT: "kind": "struct",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift",
// CHECK-NEXT: "line": 42,
// CHECK-NEXT: "properties": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "foos",
// CHECK-NEXT: "type": "[ExtractResultBuilders.Foo]",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractResultBuilders.swift",
// CHECK-NEXT: "line": 43,
// CHECK-NEXT: "valueKind": "Runtime",
// CHECK-NEXT: "resultBuilder": {
// CHECK-NEXT: "type": "ExtractResultBuilders.FooBuilder"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: ]