Merge pull request #95 from Supereg/fix/factory-linux-create-class

Fix Factory `createInstance` for class types on linux platforms

Author: wickwirew

Sources/Runtime/Factory/Factory.swift

@@ -61,10 +61,15 @@ func buildClass(type: Any.Type) throws -> Any {
     var md = ClassMetadata(type: type)
     let info = md.toTypeInfo()
     let metadata = unsafeBitCast(type, to: UnsafeRawPointer.self)
-    let instanceSize = Int32(md.pointer.pointee.classSize)
-    let alignment = Int32(md.alignment)
+    let instanceSize = Int32(md.pointer.pointee.instanceSize)
 
-    guard let value = swift_allocObject(metadata, instanceSize, alignment) else {
+    // https://github.com/wickwirew/Runtime/issues/49
+    // Docs specify that the alignment should be "always one less than a power of 2 that's at least alignof(void*)"
+    // https://github.com/apple/swift/blob/7123d2614b5f222d03b3762cb110d27a9dd98e24/include/swift/Runtime/HeapObject.h#L56-L57
+    // We could use md.alignment and deduct 1, or just use the instanceAlignmentMask from the ClassMetadata.
+    let alignmentMask = Int32(md.pointer.pointee.instanceAlignmentMask)
+
+    guard let value = swift_allocObject(metadata, instanceSize, alignmentMask) else {
             throw RuntimeError.unableToBuildType(type: type)
     }
 

Tests/RuntimeTests/GetSetStructTests.swift

@@ -29,6 +29,7 @@ class GetSetStructTests: XCTestCase {
     static var allTests: [(String, (GetSetStructTests) -> () throws -> Void)] {
         return [
             ("testGet", testGet),
+            ("testGetSimple", testGetSimple),
             ("testGetUntypedValue", testGetUntypedValue),
             ("testGetUntypedObject", testGetUntypedObject),
             ("testGetUntyped", testGetUntyped),

Tests/RuntimeTests/MetadataTests.swift

@@ -227,15 +227,15 @@ class MetadataTests: XCTestCase {
         XCTAssert(hasPayload.payloadType == Int.self)
         XCTAssert(hasTuplePayload.payloadType == (Bool, Int).self)
     }
-    
-    #if canImport(Foundation)
+
     func testObjcEnum() {
+        #if canImport(Foundation)
         var md = EnumMetadata(type: ComparisonResult.self)
         let info = md.toTypeInfo()
         XCTAssertEqual(info.numberOfEnumCases, 3)
         XCTAssertEqual(info.numberOfPayloadEnumCases, 0)
+        #endif
     }
-    #endif
 
     func testOptional() throws {
         let info = try typeInfo(of: Double?.self)

Tests/RuntimeTests/XCTestManifests.swift

@@ -3,7 +3,9 @@ import XCTest
 extension FactoryTests {
     static let __allTests = [
         ("testStruct", testStruct),
-        ("testStructUntyped", testStructUntyped)
+        ("testStructUntyped", testStructUntyped),
+        ("testClass", testClass),
+        ("testGenericClass", testGenericClass)
     ]
 }
 
@@ -33,13 +35,14 @@ extension GetSetClassTests {
         ("testSetClassUntypedValue", testSetClassUntypedValue),
         ("testSetUntyped", testSetUntyped),
         ("testSetUntypedObject", testSetUntypedObject),
-        ("testSetUntypedValue", testSetUntypedValue)
+        ("testSetUntypedValue", testSetUntypedValue)
     ]
 }
 
 extension GetSetStructTests {
     static let __allTests = [
         ("testGet", testGet),
+        ("testGetSimple", testGetSimple),
         ("testGetArray", testGetArray),
         ("testGetArrayUntyped", testGetArrayUntyped),
         ("testGetArrayUntypedObject", testGetArrayUntypedObject),
@@ -64,21 +67,27 @@ extension GetSetStructTests {
         ("testSetStructUntypedValue", testSetStructUntypedValue),
         ("testSetUntyped", testSetUntyped),
         ("testSetUntypedObject", testSetUntypedObject),
-        ("testSetUntypedValue", testSetUntypedValue)
+        ("testSetUntypedValue", testSetUntypedValue)
     ]
 }
 
 extension MetadataTests {
     static let __allTests = [
         ("testClass", testClass),
-        ("testEnum", testEnum),
-        ("testFunction", testFunction),
-        ("testFunctionThrows", testFunctionThrows),
-        ("testProtocol", testProtocol),
+        ("testResilientClass", testResilientClass),
         ("testStruct", testStruct),
+        ("testGenericStruct", testGenericStruct),
+        ("testNestedStruct", testNestedStruct),
+        ("testProtocol", testProtocol),
         ("testTuple", testTuple),
         ("testTupleNoLabels", testTupleNoLabels),
-        ("testVoidFunction", testVoidFunction)
+        ("testFunction", testFunction),
+        ("testFunctionThrows", testFunctionThrows),
+        ("testVoidFunction", testVoidFunction),
+        ("testEnum", testEnum),
+        ("testEnumTestEnumWithPayload", testEnumTestEnumWithPayload),
+        ("testObjcEnum", testObjcEnum),
+        ("testOptional", testOptional)
     ]
 }
 
@@ -89,15 +98,15 @@ extension ValuePointerTests {
         ("testClassValuePointer", testClassValuePointer),
         ("testProtocolClassValuePointer", testProtocolClassValuePointer),
         ("testProtocolStructValuePointer", testProtocolStructValuePointer),
-        ("testStructValuePointer", testStructValuePointer)
+        ("testStructValuePointer", testStructValuePointer)
     ]
 }
 
 extension ValueWitnessTableTests {
     static let __allTests = [
         ("testAlignment", testAlignment),
         ("testSize", testSize),
-        ("testStride", testStride)
+        ("testStride", testStride)
     ]
 }
 
@@ -109,7 +118,7 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(GetSetStructTests.__allTests),
         testCase(MetadataTests.__allTests),
         testCase(ValuePointerTests.__allTests),
-        testCase(ValueWitnessTableTests.__allTests)
+        testCase(ValueWitnessTableTests.__allTests)
     ]
 }
 #endif