Skip to content

[pull] swift/release/5.3 from apple:swift/release/5.3 #22

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

Merged
merged 2 commits into from
Apr 28, 2020
Merged

[pull] swift/release/5.3 from apple:swift/release/5.3 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2760d0
Fix a use-after-free in GetSwiftStdlibOSDir.
adrian-prantl Apr 28, 2020
677eb5e
Merge pull request #1131 from adrian-prantl/resourcedir-5.3
adrian-prantl Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/include/lldb/Symbol/SwiftASTContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,8 +1219,8 @@ class SwiftASTContext : public TypeSystemSwift {

/// Return the name of the OS-specific subdirectory containing the
/// Swift stdlib needed for \p target.
static llvm::StringRef GetSwiftStdlibOSDir(const llvm::Triple &target,
const llvm::Triple &host);
static std::string GetSwiftStdlibOSDir(const llvm::Triple &target,
const llvm::Triple &host);
};

class SwiftASTContextForExpressions : public SwiftASTContext {
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Symbol/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,8 @@ static SDKTypeMinVersion GetSDKType(const llvm::Triple &target,

/// Return the name of the OS-specific subdirectory containing the
/// Swift stdlib needed for \p target.
StringRef SwiftASTContext::GetSwiftStdlibOSDir(const llvm::Triple &target,
const llvm::Triple &host) {
std::string SwiftASTContext::GetSwiftStdlibOSDir(const llvm::Triple &target,
const llvm::Triple &host) {
auto sdk = GetSDKType(target, host);
XcodeSDK::Info sdk_info;
sdk_info.type = sdk.sdk_type;
Expand Down
2 changes: 1 addition & 1 deletion lldb/unittests/Symbol/TestSwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct SwiftASTContextTester : public SwiftASTContext {
platform_sdk_path, swift_dir, swift_stdlib_os_dir, xcode_contents_path,
toolchain_path, cl_tools_path);
}
static llvm::StringRef GetSwiftStdlibOSDir(const llvm::Triple &target,
static std::string GetSwiftStdlibOSDir(const llvm::Triple &target,
const llvm::Triple &host) {
return SwiftASTContext::GetSwiftStdlibOSDir(target, host);
}
Expand Down