Skip to content

[Compile Time Constant Extraction] Extract the instance type for typevalues - not the metatype #65464

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
Apr 27, 2023
Merged

[Compile Time Constant Extraction] Extract the instance type for typevalues - not the metatype #65464

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
6 changes: 5 additions & 1 deletion lib/ConstExtract/ConstExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {

case ExprKind::DotSelf: {
auto dotSelfExpr = cast<DotSelfExpr>(expr);
return std::make_shared<TypeValue>(dotSelfExpr->getType());
auto dotSelfMetaType = dotSelfExpr->getType()->getAs<AnyMetatypeType>();
if (dotSelfMetaType)
return std::make_shared<TypeValue>(dotSelfMetaType->getInstanceType());
else
break;
}

case ExprKind::UnderlyingToOpaque: {
Expand Down
12 changes: 6 additions & 6 deletions test/ConstExtraction/ExtractTypeValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ struct TypeValuePropertyStruct : MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypeValue.Warbler<Swift.String>.Type",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue7WarblerVySSGm"
// CHECK-NEXT: "type": "ExtractTypeValue.Warbler<Swift.String>",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue7WarblerVySSG"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypeValue.Avocet.Type",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue6AvocetVm"
// CHECK-NEXT: "type": "ExtractTypeValue.Avocet",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue6AvocetV"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypeValue.RainbowLorikeet.Type",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue15RainbowLorikeetVm"
// CHECK-NEXT: "type": "ExtractTypeValue.RainbowLorikeet",
// CHECK-NEXT: "mangledName": "16ExtractTypeValue15RainbowLorikeetV"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
12 changes: 6 additions & 6 deletions test/ConstExtraction/ExtractTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ public struct Types : MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypes.TypeA.Type"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeAVm"
// CHECK-NEXT: "type": "ExtractTypes.TypeA"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeAV"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypes.TypeB.Type"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeBOm"
// CHECK-NEXT: "type": "ExtractTypes.TypeB"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeBO"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "Type",
// CHECK-NEXT: "value": {
// CHECK-NEXT: "type": "ExtractTypes.TypeC.Type"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeCCm"
// CHECK-NEXT: "type": "ExtractTypes.TypeC"
// CHECK-NEXT: "mangledName": "12ExtractTypes5TypeCC"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]