[Runtime] Fix SinglePayloadEnumSimple read offset in swift_resolve_resilientAccessors

The offset was off by 1, causing subsequent tags to not be resolved properly.

Author: drexin

stdlib/public/runtime/BytecodeLayouts.cpp

@@ -1034,7 +1034,7 @@ void swift::swift_resolve_resilientAccessors(uint8_t *layoutStr,
       reader.skip(sizeof(uintptr_t));
       break;
     case RefCountingKind::SinglePayloadEnumSimple:
-      reader.skip((3 * sizeof(uint64_t)) + (4 * sizeof(size_t)));
+      reader.skip((2 * sizeof(uint64_t)) + (4 * sizeof(size_t)));
       break;
 
     case RefCountingKind::SinglePayloadEnumFN: {

test/Interpreter/layout_string_witnesses_dynamic.swift

@@ -974,6 +974,41 @@ func testResilientPayloadSinglePayloadEnum() {
 
 testResilientPayloadSinglePayloadEnum()
 
+struct SinglePayloadSimpleResolve {
+    let x: ResilientSinglePayloadEnumSimple
+    let y: ResilientSinglePayloadEnumComplex
+}
+
+func testSinglePayloadSimpleResolve() {
+    let ptr = allocateInternalGenericPtr(of: SinglePayloadSimpleResolve.self)
+
+    do {
+        let x = SinglePayloadSimpleResolve(x: .nonEmpty(SimpleClass(x: 23)), y: .nonEmpty(.nonEmpty1(SimpleClass(x: 23))))
+        testGenericInit(ptr, to: x)
+    }
+
+    do {
+        let y = SinglePayloadSimpleResolve(x: .nonEmpty(SimpleClass(x: 32)), y: .nonEmpty(.nonEmpty1(SimpleClass(x: 32))))
+        // CHECK: Before deinit
+        print("Before deinit")
+
+        // CHECK-NEXT: SimpleClass deinitialized!
+        // CHECK-NEXT: SimpleClass deinitialized!
+        testGenericAssign(ptr, from: y)
+    }
+
+    // CHECK-NEXT: Before deinit
+    print("Before deinit")
+
+    // CHECK-NEXT: SimpleClass deinitialized!
+    // CHECK-NEXT: SimpleClass deinitialized!
+    testGenericDestroy(ptr, of: SinglePayloadSimpleResolve.self)
+
+    ptr.deallocate()
+}
+
+testSinglePayloadSimpleResolve()
+
 #if os(macOS)
 
 import Foundation