Skip to content

[Compile Time Constant Extraction] Add extraction of Dictionary values. #62752

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 3 commits into from
Jan 5, 2023
Merged

[Compile Time Constant Extraction] Add extraction of Dictionary values. #62752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
813f542
[Compile Time Constant Extraction] Add extraction of Dictionary values.
Dec 22, 2022
a0aa318
Address PR feedback, including narrowing element type of `DictionaryV…
Dec 22, 2022
b4a1fc6
Check that pointer type is `TupleValue` before doing the static cast.
Dec 22, 2022
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
30 changes: 19 additions & 11 deletions include/swift/AST/ConstTypeInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Copyright (c) 2022 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
Expand Down Expand Up @@ -102,16 +102,6 @@ class BuilderValue : public CompileTimeValue {
std::vector<CompileTimeValue> Members;
};

/// A dictionary literal value representation
class DictionaryValue : public CompileTimeValue {
public:
DictionaryValue() : CompileTimeValue(ValueKind::Dictionary) {}

static bool classof(const CompileTimeValue *T) {
return T->getKind() == ValueKind::Dictionary;
}
};

struct TupleElement {
Optional<std::string> Label;
swift::Type Type;
Expand Down Expand Up @@ -151,6 +141,24 @@ class ArrayValue : public CompileTimeValue {
std::vector<std::shared_ptr<CompileTimeValue>> Elements;
};

/// A dictionary literal value representation
class DictionaryValue : public CompileTimeValue {
public:
DictionaryValue(std::vector<std::shared_ptr<TupleValue>> elements)
: CompileTimeValue(ValueKind::Dictionary), Elements(elements) {}

static bool classof(const CompileTimeValue *T) {
return T->getKind() == ValueKind::Dictionary;
}

std::vector<std::shared_ptr<TupleValue>> getElements() const {
return Elements;
}

private:
std::vector<std::shared_ptr<TupleValue>> Elements;
};

/// A representation of an arbitrary value that does not fall under
/// any of the above categories.
class RuntimeValue : public CompileTimeValue {
Expand Down
25 changes: 23 additions & 2 deletions lib/ConstExtract/ConstExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ parseProtocolListFromFile(StringRef protocolListFilePath,
static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
if (expr) {
switch (expr->getKind()) {
case ExprKind::Dictionary:

case ExprKind::BooleanLiteral:
case ExprKind::FloatLiteral:
case ExprKind::IntegerLiteral:
Expand All @@ -148,6 +146,18 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
return std::make_shared<ArrayValue>(elementValues);
}

case ExprKind::Dictionary: {
auto dictionaryExpr = cast<DictionaryExpr>(expr);
std::vector<std::shared_ptr<TupleValue>> tuples;
for (auto elementExpr : dictionaryExpr->getElements()) {
auto elementValue = extractCompileTimeValue(elementExpr);
if (isa<TupleValue>(elementValue.get())) {
tuples.push_back(std::static_pointer_cast<TupleValue>(elementValue));
}
}
return std::make_shared<DictionaryValue>(tuples);
}

case ExprKind::Tuple: {
auto tupleExpr = cast<TupleExpr>(expr);

Expand Down Expand Up @@ -383,6 +393,17 @@ void writeValue(llvm::json::OStream &JSON,

case CompileTimeValue::ValueKind::Dictionary: {
JSON.attribute("valueKind", "Dictionary");
JSON.attributeArray("value", [&] {
for (auto tupleValue : cast<DictionaryValue>(value)->getElements()) {
auto tupleElements = tupleValue.get()->getElements();
JSON.object([&] {
JSON.attributeObject(
"key", [&] { writeValue(JSON, tupleElements[0].Value); });
JSON.attributeObject(
"value", [&] { writeValue(JSON, tupleElements[1].Value); });
});
}
});
break;
}

Expand Down
122 changes: 120 additions & 2 deletions test/ConstExtraction/ExtractGroups.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,118 @@
// CHECK-NEXT: "type": "[Swift.String : Swift.Int]",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "[(\"One\", 1), (\"Two\", 2), (\"Three\", 3)]"
// CHECK-NEXT: "valueKind": "Dictionary",
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"One\""
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "1"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Two\""
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "2"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Three\""
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "3"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "dict2",
// CHECK-NEXT: "type": "[Swift.Int : [Swift.String]]",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "valueKind": "Dictionary",
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "1"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "Array",
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"a\""
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"b\""
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"c\""
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "2"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "Array",
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"z\""
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "dict3",
// CHECK-NEXT: "type": "[Swift.String : ExtractGroups.Foo]",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "valueKind": "Dictionary",
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Bar\""
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "InitCall",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractGroups.Bar",
// CHECK-NEXT: "arguments": []
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Int\""
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "42"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand Down Expand Up @@ -155,6 +265,14 @@ public struct Arrays : MyProto {

public struct Dictionaries : MyProto {
let dict1: [String: Int] = ["One": 1, "Two": 2, "Three": 3]
let dict2: [Int: [String]] = [
1: ["a", "b", "c"],
2: ["z"]
]
let dict3: [String: Foo] = [
"Bar": Bar(),
"Int": 42
]
}

public struct Tuples : MyProto {
Expand Down