Skip to content

RemoteMirror generic multi-payload-enum fixes #41903

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 4 commits into from
Mar 28, 2022
Merged

RemoteMirror generic multi-payload-enum fixes #41903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bab8951
RemoteMirror generic multi-payload-enum fixes
tbkka Mar 18, 2022
c406b06
Rename test classes to reflect internal concepts
tbkka Mar 25, 2022
7456017
Fix handling of nested generic multi-payload enums
tbkka Mar 25, 2022
8f89f5c
Fix up test for 64-bit and 32-bit targets
tbkka Mar 26, 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
6 changes: 5 additions & 1 deletion stdlib/public/Reflection/TypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,8 +1061,12 @@ class ThickenMetatype
std::vector<const TypeRef *> GenericParams;
for (auto Param : BG->getGenericParams())
GenericParams.push_back(visit(Param));
auto parent = BG->getParent();
if (parent) {
parent = ThickenMetatype(Builder).visit(parent);
}
return BoundGenericTypeRef::create(Builder, BG->getMangledName(),
GenericParams);
GenericParams, parent);
}

const TypeRef *visitTupleTypeRef(const TupleTypeRef *T) {
Expand Down
160 changes: 160 additions & 0 deletions validation-test/Reflection/reflect_Enum_MultiPayload_generic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
// RUN: %empty-directory(%t)
// RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Enum_MultiPayload_generic
// RUN: %target-codesign %t/reflect_Enum_MultiPayload_generic

// RUN: %target-run %target-swift-reflection-test %t/reflect_Enum_MultiPayload_generic | tee /dev/stderr | %FileCheck %s --check-prefix=CHECK --check-prefix=X%target-ptrsize --dump-input=fail

// REQUIRES: reflection_test_support
// REQUIRES: objc_interop
// REQUIRES: executable_test
// UNSUPPORTED: use_os_stdlib

import SwiftReflectionTest

struct S {
var a: Int
var b: Int
var c: Int
}

class ClassWithEnumDepth0<T> {
enum E {
case t(T)
case u(Int)
}
var e: E?
}

reflect(object: ClassWithEnumDepth0<S>())

// CHECK: Reflecting an object.
// CHECK-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
// CHECK-NEXT: Type reference:
// CHECK-NEXT: (bound_generic_class reflect_Enum_MultiPayload_generic.ClassWithEnumDepth0
// CHECK-NEXT: (struct reflect_Enum_MultiPayload_generic.S))

// X64: Type info:
// X64-NEXT: (class_instance size=41 alignment=8 stride=48 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=e offset=16
// X64-NEXT: (single_payload_enum size=25 alignment=8 stride=32 num_extra_inhabitants=253 bitwise_takable=1
// X64-NEXT: (case name=some index=0 offset=0
// X64-NEXT: (multi_payload_enum size=25 alignment=8 stride=32 num_extra_inhabitants=254 bitwise_takable=1
// X64-NEXT: (case name=t index=0 offset=0
// X64-NEXT: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=a offset=0
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
// X64-NEXT: (field name=b offset=8
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
// X64-NEXT: (field name=c offset=16
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))))
// X64-NEXT: (case name=u index=1 offset=0
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))))
// X64-NEXT: (case name=none index=1))))

// X32: Type info:
// X32-NEXT: (class_instance size=21 alignment=4 stride=24 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=e offset=8
// X32-NEXT: (single_payload_enum size=13 alignment=4 stride=16 num_extra_inhabitants=253 bitwise_takable=1
// X32-NEXT: (case name=some index=0 offset=0
// X32-NEXT: (multi_payload_enum size=13 alignment=4 stride=16 num_extra_inhabitants=254 bitwise_takable=1
// X32-NEXT: (case name=t index=0 offset=0
// X32-NEXT: (struct size=12 alignment=4 stride=12 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=a offset=0
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))
// X32-NEXT: (field name=b offset=4
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))
// X32-NEXT: (field name=c offset=8
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))))
// X32-NEXT: (case name=u index=1 offset=0
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))))
// X32-NEXT: (case name=none index=1))))


class ClassWithEnumDepth1<T> {
enum E<T> {
case t(T)
case u(Int)
}
var e: E<T>?
}

reflect(object: ClassWithEnumDepth1<S>())

// CHECK: Reflecting an object.
// CHECK-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
// CHECK-NEXT: Type reference:
// CHECK-NEXT: (bound_generic_class reflect_Enum_MultiPayload_generic.ClassWithEnumDepth1
// CHECK-NEXT: (struct reflect_Enum_MultiPayload_generic.S))

// X64: Type info:
// X64-NEXT: (class_instance size=41 alignment=8 stride=48 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=e offset=16
// X64-NEXT: (single_payload_enum size=25 alignment=8 stride=32 num_extra_inhabitants=253 bitwise_takable=1
// X64-NEXT: (case name=some index=0 offset=0
// X64-NEXT: (multi_payload_enum size=25 alignment=8 stride=32 num_extra_inhabitants=254 bitwise_takable=1
// X64-NEXT: (case name=t index=0 offset=0
// X64-NEXT: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=a offset=0
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
// X64-NEXT: (field name=b offset=8
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
// X64-NEXT: (field name=c offset=16
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))))
// X64-NEXT: (case name=u index=1 offset=0
// X64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1
// X64-NEXT: (field name=_value offset=0
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))))
// X64-NEXT: (case name=none index=1))))

// X32: Type info:
// X32-NEXT: (class_instance size=21 alignment=4 stride=24 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=e offset=8
// X32-NEXT: (single_payload_enum size=13 alignment=4 stride=16 num_extra_inhabitants=253 bitwise_takable=1
// X32-NEXT: (case name=some index=0 offset=0
// X32-NEXT: (multi_payload_enum size=13 alignment=4 stride=16 num_extra_inhabitants=254 bitwise_takable=1
// X32-NEXT: (case name=t index=0 offset=0
// X32-NEXT: (struct size=12 alignment=4 stride=12 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=a offset=0
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))
// X32-NEXT: (field name=b offset=4
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))
// X32-NEXT: (field name=c offset=8
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))))
// X32-NEXT: (case name=u index=1 offset=0
// X32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1
// X32-NEXT: (field name=_value offset=0
// X32-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))))))
// X32-NEXT: (case name=none index=1))))

doneReflecting()

// CHECK: Done.