Page MenuHomePhabricator

Please use GitHub pull requests for new patches. Phabricator shutdown timeline

Differential D85358

Correctly detect legacy iOS simulator Mach-O objectfiles
ClosedPublic
Actions

Authored by aprantl on Aug 5 2020, 1:56 PM.

Details

Reviewers
friss
jasonmolenda
Commits
rG05df9cc70367: Correctly detect legacy iOS simulator Mach-O objectfiles
Summary

The code in ObjectFileMachO didn't disambiguate between ios and ios-simulator object files for Mach-O objects using the legacy ambiguous LC_VERSION_MIN load commands. This used to not matter before taught ArchSpec that ios and ios-simulator are no longer compatible.

rdar://problem/66545307

Diff Detail

Event Timeline

aprantl requested review of this revision.Aug 5 2020, 1:56 PM
aprantl created this revision.
friss added inline comments.Aug 5 2020, 2:01 PM
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
5029–5030

It seems like this will also mark a binary with LC_VERSION_MIN_MACOSX as a simulator binary?

aprantl updated this revision to Diff 283401.Aug 5 2020, 2:38 PM

Excellent point, Fred!

aprantl marked an inline comment as done.Aug 5 2020, 2:39 PM
aprantl updated this revision to Diff 283404.Aug 5 2020, 2:52 PM

Fix typo in test

aprantl updated this revision to Diff 283405.Aug 5 2020, 2:59 PM

Fix a second mistake in the updated test.

aprantl added a child revision: D85243: Factor out common code from the iPhone/AppleTV/WatchOS simulator platform plugins. (NFC).Aug 5 2020, 3:22 PM
friss accepted this revision.Aug 6 2020, 12:35 PM

LGTM!

This revision is now accepted and ready to land.Aug 6 2020, 12:35 PM
Closed by commit rG05df9cc70367: Correctly detect legacy iOS simulator Mach-O objectfiles (authored by aprantl). · Explain WhyAug 6 2020, 12:41 PM
This revision was automatically updated to reflect the committed changes.
aprantl added a commit: rG05df9cc70367: Correctly detect legacy iOS simulator Mach-O objectfiles.
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2020, 12:41 PM

Revision Contents
Changeset List

PathSize
lldb/
source/
Plugins/
ObjectFile/
Mach-O/
16 lines
Utility/
27 lines
test/
API/
macosx/
simulator/
16 lines
unittests/
Utility/
19 lines

Diff 283706

View Options

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Loading...
View Options

lldb/source/Utility/ArchSpec.cpp

Loading...
View Options

lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

Loading...
View Options

lldb/unittests/Utility/ArchSpecTest.cpp

Loading...