Skip to content
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.

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

Fix reading the Xcode SDK DWARF attribute from DebugMap symbol files. #1184

Merged
merged 4 commits into from
May 7, 2020

Conversation

adrian-prantl
Copy link

The also proactively resolves the merge conflict that would be introduced by #1182

…e units

When debugging from a SymbolMap the creation of CompileUnits for the
individual object files is so lazy that RegisterXcodeSDK() is not
invoked at all before the Swift TypeSystem wants to read it. This
patch fixes this by introducing an explicit
SymbolFile::ParseXcodeSDK() call that can be invoked deterministically
before the result is required.

<rdar://problem/62532151+62326862>

https://reviews.llvm.org/D79273
(cherry picked from commit 5935227)

 Conflicts:
	lldb/include/lldb/Core/Module.h
When debugging a remote platform, the platform you get from
GetPlatformForArchitecture doesn't inherit from PlatformDarwin.
HostInfoMacOSX seems like the right place to have a global store of
local paths.

Differential Revision: https://reviews.llvm.org/D79364

(cherry picked from commit f0c08b7)
When debugging from a SymbolMap the creation of CompileUnits for the
object files is so lazy that RegisterXcodeSDK() is not invoked at all
before we need it in SwiftASTContext. This patch fixes this by
using the new explicit SymbolFile::ParseXcodeSDK() call that is
invoked deterministically before the result is required.

This restores macCatalyst support.

<rdar://problem/62532151>
@adrian-prantl adrian-prantl requested a review from fredriss May 6, 2020 23:13
@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl
Copy link
Author

rdar://problem/62677400

@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl adrian-prantl merged commit 1f5cdee into swiftlang:swift/release/5.3 May 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant