averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78462 from venkatesh5789/partial-keypath-extraction

Browse Source 
[Compile Time Constant Extraction] Extract Partial Keypath Expressions
This commit is contained in:
Venkatesh Sriram
2025-01-09 11:11:07 +05:30
committed by GitHub
parent 5ccb26b16c 14a5207f48
commit aa498087ac
2 changed files with 120 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ConstExtract/ConstExtract.cpp
View File

@@ -487,6 +487,11 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
}
break;
}
case ExprKind::DerivedToBase: {
auto derivedExpr = cast<DerivedToBaseExpr>(expr);
return extractCompileTimeValue(derivedExpr->getSubExpr());
}
default: {
break;
}

122
test/ConstExtraction/ExtractKeyPaths.swift
View File

@@ -22,8 +22,18 @@ public struct MyType {
}
}
struct Item {
var foo: String
let bar: String
}
public struct KeyPaths: MyProto {
static let nestedVariable = \MyType.nested.foo.bar.baz
static let keyPath1: PartialKeyPath<Item> = \Item.foo
static var keyPath2: KeyPath<Item, String> = \Item.foo
static var keyPath3: WritableKeyPath<Item, String> = \Item.foo
static var keyPath4: PartialKeyPath<Item> = \Item.bar
static var keyPath5: KeyPath<Item, String> = \Item.bar
static let nestedKeyPath = \MyType.nested.foo.bar.baz
}
// CHECK: [
@@ -32,8 +42,7 @@ public struct KeyPaths: MyProto {
// CHECK-NEXT: "mangledTypeName": "15ExtractKeyPaths0bC0V",
// CHECK-NEXT: "kind": "struct",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 25,
// CHECK-NEXT: "conformances": [
// CHECK: "conformances": [
// CHECK-NEXT: "ExtractKeyPaths.MyProto"
// CHECK-NEXT: ],
// CHECK-NEXT: "allConformances": [
@@ -42,16 +51,115 @@ public struct KeyPaths: MyProto {
// CHECK-NEXT: "conformanceDefiningModule": "ExtractKeyPaths"
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "associatedTypeAliases": [],
// CHECK-NEXT: "properties": [
// CHECK: "properties": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "keyPath1",
// CHECK-NEXT: "type": "Swift.PartialKeyPath<ExtractKeyPaths.Item>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 31,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "foo",
// CHECK-NEXT: "rootType": "ExtractKeyPaths.Item",
// CHECK-NEXT: "components": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "foo",
// CHECK-NEXT: "type": "Swift.String"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "keyPath2",
// CHECK-NEXT: "type": "Swift.KeyPath<ExtractKeyPaths.Item, Swift.String>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 32,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "foo",
// CHECK-NEXT: "rootType": "ExtractKeyPaths.Item",
// CHECK-NEXT: "components": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "foo",
// CHECK-NEXT: "type": "Swift.String"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "keyPath3",
// CHECK-NEXT: "type": "Swift.WritableKeyPath<ExtractKeyPaths.Item, Swift.String>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 33,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "foo",
// CHECK-NEXT: "rootType": "ExtractKeyPaths.Item",
// CHECK-NEXT: "components": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "foo",
// CHECK-NEXT: "type": "Swift.String"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "keyPath4",
// CHECK-NEXT: "type": "Swift.PartialKeyPath<ExtractKeyPaths.Item>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 34,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "bar",
// CHECK-NEXT: "rootType": "ExtractKeyPaths.Item",
// CHECK-NEXT: "components": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "bar",
// CHECK-NEXT: "type": "Swift.String"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "keyPath5",
// CHECK-NEXT: "type": "Swift.KeyPath<ExtractKeyPaths.Item, Swift.String>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 35,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "bar",
// CHECK-NEXT: "rootType": "ExtractKeyPaths.Item",
// CHECK-NEXT: "components": [
// CHECK-NEXT: {
// CHECK-NEXT: "label": "bar",
// CHECK-NEXT: "type": "Swift.String"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "nestedVariable",
// CHECK-NEXT: "label": "nestedKeyPath",
// CHECK-NEXT: "type": "Swift.WritableKeyPath<ExtractKeyPaths.MyType, Swift.String>",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractKeyPaths.swift",
// CHECK-NEXT: "line": 26,
// CHECK-NEXT: "line": 36,
// CHECK-NEXT: "valueKind": "KeyPath",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "path": "nested.foo.bar.baz",