Merge pull request #77078 from drexin/wip-oops

[Runtime] Use aligned offset to compute new field offset for unmanage…

Author: drexin

stdlib/public/runtime/Metadata.cpp

@@ -2846,18 +2846,16 @@ void swift::swift_initStructMetadataWithLayoutString(
       const TypeLayout *fieldType = (const TypeLayout*)fieldTypes[i];
       auto alignmentMask = fieldType->flags.getAlignmentMask();
       fullOffset = roundUpToAlignMask(fullOffset, alignmentMask);
-
+      size_t offset = fullOffset - unalignedOffset + previousFieldOffset;
       if (fieldTag <= 0x4) {
-        size_t offset = fullOffset - unalignedOffset + previousFieldOffset;
-
         auto tag = fieldTag <= 0x2 ? RefCountingKind::UnknownUnowned :
                                      RefCountingKind::UnknownWeak;
 
         auto tagAndOffset = ((uint64_t)tag << 56) | offset;
         writer.writeBytes(tagAndOffset);
         previousFieldOffset = fieldType->size - sizeof(uintptr_t);
       } else {
-        previousFieldOffset += fieldType->size;
+        previousFieldOffset = offset + fieldType->size;
       }
 
       fullOffset += fieldType->size;

test/Interpreter/Inputs/layout_string_witnesses_types_resilient.swift

@@ -20,9 +20,10 @@ public struct GenericResilient<C, T> {
 }
 
 public struct GenericResilientWithUnmanagedAndWeak<T> {
-    public let x: T
+    public let b: Bool = false
     public unowned(unsafe) var y: AnyObject?
-    public let z: Int = 500
+    public let z: Bool = false
+    public let x: T
     public weak var w: AnyObject?
 
     public init(x: T) {