moved get mangled name to CRuntime

Author: wickwirew

Package.resolved

@@ -1,14 +1,14 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 import PackageDescription
 let package = Package(
     name: "Runtime",
     products: [
         .library(
             name: "Runtime",
-            targets: ["Runtime"])
+            targets: ["Runtime"])
         ],
         dependencies: [
-            .package(url: "https://github.com/wickwirew/CRuntime.git", from: "1.0.0")
+             .package(url: "https://github.com/wickwirew/CRuntime.git", from: "2.0.1")
         ],
     targets: [
         .target(
@@ -18,5 +18,5 @@ let package = Package(
             name: "RuntimeTests",
             dependencies: ["Runtime"])
     ],
-    swiftLanguageVersions: [.v4_2]
+    swiftLanguageVersions: [.v5]
 )

Package.swift

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
     s.name         = "Runtime"
-    s.version      = "0.7.1"
+    s.version      = "2.0.0"
     s.summary      = "Runtime"
     s.description  = <<-DESC
     Runtime abilities for native swift objects.
@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
     s.license      = "MIT"
     s.author       = { "Wesley Wickwire" => "[email protected]" }
     s.platform     = :ios, "9.0"
-    s.source       = { :git => "https://github.com/wickwirew/Runtime.git", :tag => "0.7.1" }
+    s.source       = { :git => "https://github.com/wickwirew/Runtime.git", :tag => s.version }
     s.source_files  = 'Runtime/**/*.swift'
 end

Runtime.podspec

@@ -20,6 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import CRuntime
+
 /// https://github.com/apple/swift/blob/f2c42509628bed66bf5b8ee02fae778a2ba747a1/include/swift/Reflection/Records.h#L160
 struct FieldDescriptor {
 
@@ -38,7 +40,7 @@ struct FieldDescriptor {
 struct FieldRecord {
 
     var fieldRecordFlags: Int32
-    var _mangledTypeName: RelativePointer<Int32, UInt8>
+    var _mangledTypeName: RelativePointer<Int32, Int8>
     var _fieldName: RelativePointer<Int32, UInt8>
 
     var isVar: Bool {
@@ -56,15 +58,17 @@ struct FieldRecord {
     mutating func type(genericContext: UnsafeRawPointer?,
                        genericArguments: UnsafeRawPointer?) -> Any.Type {
         let typeName = _mangledTypeName.advanced()
-        return _getTypeByMangledNameInContext(
+        let metadataPtr = swift_getTypeByMangledNameInContext(
             typeName,
             getSymbolicMangledNameLength(typeName),
-            genericContext: genericContext,
-            genericArguments: genericArguments
+            genericContext,
+            genericArguments?.assumingMemoryBound(to: Optional<UnsafeRawPointer>.self)
         )!
+        
+        return unsafeBitCast(metadataPtr, to: Any.Type.self)
     }
 
-    func getSymbolicMangledNameLength(_ base: UnsafeRawPointer) -> Int {
+    func getSymbolicMangledNameLength(_ base: UnsafeRawPointer) -> Int32 {
         var end = base
         while let current = Optional(end.load(as: UInt8.self)), current != 0 {
             end += 1
@@ -75,7 +79,7 @@ struct FieldRecord {
             }
         }
 
-        return end - base
+        return Int32(end - base)
     }
 }
 

Runtime.xcodeproj/project.pbxproj

@@ -60,11 +60,14 @@ class MetadataTests: XCTestCase {
 
     func testGenericStruct() {
         struct A<B, C, D, E, F, G, H> { let b: B }
-        var md = StructMetadata(type: A<Int, Int, Int, Int, Int, Int, Int>.self)
+        var md = StructMetadata(type: A<Int, String, Bool, Int, Int, Int, Int>.self)
         var args = md.genericArguments()
         let props = md.properties()
         XCTAssert(args.count == 7)
-        XCTAssert(args[1] == Int.self)
+        XCTAssert(args[0] == Int.self)
+        XCTAssert(args[1] == String.self)
+        XCTAssert(args[2] == Bool.self)
+        XCTAssert(args[3] == Int.self)
         XCTAssert(props.count == 1)
         XCTAssert(props[0].type == Int.self)
     }