Skip to content

[runtime] Directly reference objc_setHook_getImageName #19414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 21, 2018
Merged

[runtime] Directly reference objc_setHook_getImageName #19414

merged 1 commit into from
Sep 21, 2018

Conversation

jrose-apple
Copy link
Contributor

(instead of using dlsym)

The original use went in before <objc/runtime.h> was updated, but now it should be present in all Xcode 10 SDKs.

rdar://problem/42137765

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test Linux

mikeash
mikeash reviewed Sep 20, 2018
View reviewed changes
Copy link
Contributor

@mikeash mikeash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

mikeash
mikeash approved these changes Sep 20, 2018
View reviewed changes
Copy link
Contributor

@mikeash mikeash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, didn't actually approve it.

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - bdda1e210d03bdd796e72c6dfffbe6c8b3848e64

@jrose-apple
Copy link
Contributor Author 

11:15:53 Undefined symbols for architecture armv7s:
11:15:53   "___isOSVersionAtLeast", referenced from:
11:15:53       swift::setUpObjCRuntimeGetImageNameFromClass() in ObjCRuntimeGetImageNameFromClass.mm.o
11:15:53 ld: symbol(s) not found for architecture armv7s

Uh, hm. Do we need a runtime library that's not present to do this? Oh well, I'll go back to the old way and silence the warning.

@jrose-apple
[runtime] Directly reference objc_setHook_getImageName
9cb6d39 
(instead of using dlsym)

The original use went in before <objc/runtime.h> was updated, but now
it should be present in all Xcode 10 SDKs.

rdar://problem/42137765
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test Linux

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - bdda1e210d03bdd796e72c6dfffbe6c8b3848e64

@mikeash
Copy link
Contributor

mikeash commented Sep 20, 2018

Weird. Does @available itself require some newer OS version than we're targeting?

@jrose-apple
Copy link
Contributor Author

jrose-apple commented Sep 20, 2018 •
edited
Loading

I suspect it just requires compiler-rt or something that's not being built in all configurations, but I'm not motivated enough to find out since this way is fine too.

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@jrose-apple jrose-apple merged commit 6930a0f into swiftlang:master Sep 21, 2018
@jrose-apple jrose-apple deleted the off-the-hook branch August 15, 2019 01:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikeash mikeash mikeash approved these changes

@gparker42 gparker42 Awaiting requested review from gparker42

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jrose-apple @swift-ci @mikeash