Skip to content

Commit

Permalink
Merge pull request #3498 from ReactiveCocoa/fix-swift-runtime-infinit…
Browse files Browse the repository at this point in the history
…e-recursion

[Xcode 9 beta 5] Fixed an issue causing infinite recursion in the Swift runtime.
  • Loading branch information
andersio committed Aug 16, 2017
2 parents bb31e7f + 325a1ea commit 4e57bc5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ matrix:
- script:
- gem install cocoapods
- pod repo update
- pod lib lint ReactiveCocoa.podspec
- pod lib lint ReactiveCocoa.podspec --allow-warnings
env:
- JOB=PODSPEC
- stage: prepare carthage cache
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# master
*Please put new entries at the top.

1. [Xcode 9 beta 5] Fixed an issue causing infinite recursion in the Swift runtime. (#3498, kudos to @andersio)

# 6.0.0
# 6.0.0-rc.3
# 6.0.0-rc.2
Expand Down
2 changes: 1 addition & 1 deletion ReactiveCocoa/ObjC+RuntimeSubclassing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private func subclassName(of class: AnyClass) -> String {
/// - class: The class to swizzle.
/// - perceivedClass: The class to be reported by the methods.
private func replaceGetClass(in class: AnyClass, decoy perceivedClass: AnyClass) {
let getClass: @convention(block) (Any) -> AnyClass = { _ in
let getClass: @convention(block) (UnsafeRawPointer?) -> AnyClass = { _ in
return perceivedClass
}

Expand Down

0 comments on commit 4e57bc5

Please sign in to comment.