This gets through a larger set of tests, but still has a few hacks

Author: tbkka

stdlib/tools/swift-reflection-test/swift-reflection-test.c

@@ -615,6 +615,7 @@ int reflectEnumValue(SwiftReflectionContextRef RC,
 
   printf("Value: ");
   int parens = 0;
+  // Walk into successively nested enum types...
   while (EnumTypeRef != 0) {
     swift_typeinfo_t EnumTypeInfo = swift_reflection_infoForTypeRef(RC, EnumTypeRef);
     switch (EnumTypeInfo.Kind) {
@@ -633,42 +634,48 @@ int reflectEnumValue(SwiftReflectionContextRef RC,
         PipeMemoryReader_sendDoneMessage(&Pipe);
         return 0;
       }
-
       swift_childinfo_t CaseInfo
         = swift_reflection_childOfTypeRef(RC, EnumTypeRef, CaseIndex);
       printf(".%s", CaseInfo.Name);
-      EnumTypeRef = CaseInfo.TR;
-      if (EnumTypeRef != 0) {
+
+      if (EnumTypeInfo.Kind == SWIFT_NO_PAYLOAD_ENUM || CaseInfo.TR == 0) {
+        // No payload here, so end the walk
+        EnumTypeRef = 0;
+      } else {
+        // There's a payload!
         printf("(");
         parens += 1;
-      }
-      break;
-    }
-    case SWIFT_STRONG_REFERENCE: // Might be an indirect enum...
-    {
-      // Get the pointer value from the target
-      void *outFreeContext = NULL;
-      const void *rawPtr
-        = PipeMemoryReader_readBytes((void *)&Pipe, EnumInstance, 8, &outFreeContext);
-      uintptr_t instance = *(uintptr_t *)rawPtr;
-      PipeMemoryReader_freeBytes((void *)&Pipe, rawPtr, outFreeContext);
-
-      // Indirect enum is stored as the first field of a closure context...
-      swift_typeinfo_t TI = swift_reflection_infoForInstance(RC, instance);
-      if (TI.Kind == SWIFT_CLOSURE_CONTEXT) {
-        swift_childinfo_t CaseInfo
-          = swift_reflection_childOfInstance(RC, instance, 0);
-        if (CaseInfo.Kind == SWIFT_NO_PAYLOAD_ENUM
-            || CaseInfo.Kind == SWIFT_SINGLE_PAYLOAD_ENUM
-            || CaseInfo.Kind == SWIFT_MULTI_PAYLOAD_ENUM) {
-          // Found the indirect enum storage, loop to print it out.
-          EnumTypeRef = CaseInfo.TR;
-          EnumInstance = instance + CaseInfo.Offset;
-          break;
+        EnumTypeRef = CaseInfo.TR; // Walk into payload to see if it's an enum
+
+        if (CaseInfo.Kind == SWIFT_STRONG_REFERENCE) { // Maybe an indirect enum?
+          // Get the pointer value from the target
+          void *outFreeContext = NULL;
+          // !!! FIXME !!! obtain the pointer by properly projecting the enum value
+          // Next lines are a hack to prove the concept.
+          const void *rawPtr
+            = PipeMemoryReader_readBytes((void *)&Pipe, EnumInstance, 8, &outFreeContext);
+          uintptr_t instance = *(uintptr_t *)rawPtr & 0xffffffffffffff8ULL;
+          PipeMemoryReader_freeBytes((void *)&Pipe, rawPtr, outFreeContext);
+
+          // Indirect enum stores the payload as the first field of a closure context
+          swift_typeinfo_t TI = swift_reflection_infoForInstance(RC, instance);
+          if (TI.Kind == SWIFT_CLOSURE_CONTEXT) {
+            // Yep, it's an indirect enum.  Let's follow the pointer...
+            // TODO: Could we get here if we have an enum whose payload is a closure?
+            swift_childinfo_t CaseInfo
+              = swift_reflection_childOfInstance(RC, instance, 0);
+            if (CaseInfo.Kind == SWIFT_NO_PAYLOAD_ENUM
+                || CaseInfo.Kind == SWIFT_SINGLE_PAYLOAD_ENUM
+                || CaseInfo.Kind == SWIFT_MULTI_PAYLOAD_ENUM) {
+              // Found the indirect enum storage, loop to print it out.
+              EnumTypeRef = CaseInfo.TR;
+              EnumInstance = instance + CaseInfo.Offset;
+              break;
+            }
+          }
         }
       }
-      // Not an indirect enum, fall through...
-      __attribute__((fallthrough));
+      break;
     }
     default:
     {