Commit299bc0f

committed

fix swift 5.4 on linux

1 parent98096c6 commit299bc0fCopy full SHA for 299bc0f

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ jobs:`
`36`	`36`	`linux:`
`37`	`37`	`strategy:`
`38`	`38`	`matrix:`
`39`		`-swift_version:['5.2', '5.3']`
	`39`	`+swift_version:['5.2', '5.3', '5.4']`
`40`	`40`	`runs-on:ubuntu-latest`
`41`	`41`	`container:`
`42`	`42`	`image:swift:${{ matrix.swift_version }}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,19 +118,29 @@ private struct AnyMetadata {`
`118`	`118`	`privatestructAnyClassMetadata{`
`119`	`119`	`var_kind:UInt // isaPointer for classes`
`120`	`120`	`varsuperClass:Any.Type`
	`121`	`+#if !swift(>=5.4) \|\| canImport(ObjectiveC)`
	`122`	`+ // ABI change in Swift 5.4`
	`123`	`+ // https://github.com/wickwirew/Runtime/issues/92`
`121`	`124`	`varcacheData:(Int,Int)`
`122`	`125`	`varrodataPointer:Int`
	`126`	`+#endif`
`123`	`127`
`124`	`128`	`varisSwiftClass:Bool{`
	`129`	`+#if !swift(>=5.4) \|\| canImport(ObjectiveC)`
`125`	`130`	`return(rodataPointer& classIsSwiftMask)!=0`
	`131`	`+#else`
	`132`	`+returntrue`
	`133`	`+#endif`
`126`	`134`	`}`
`127`	`135`	`}`
`128`	`136`
`129`	`137`	`privatestructClassMetadata{`
`130`	`138`	`var_kind:UInt // isaPointer for classes`
`131`	`139`	`varsuperClass:Any.Type`
	`140`	`+#if !swift(>=5.4) \|\| canImport(ObjectiveC)`
`132`	`141`	`varcacheData:(Int,Int)`
`133`	`142`	`varrodataPointer:Int`
	`143`	`+#endif`
`134`	`144`	`varclassFlags:Int32`
`135`	`145`	`varinstanceAddressPoint:UInt32`
`136`	`146`	`varinstanceSize:UInt32`

Comments

(0)