Merge pull request #24 from swiftwasm/swift/master

[pull] swiftwasm from swift/master

Author: pull[bot]

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -1240,8 +1240,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 {

lldb/source/Symbol/SwiftASTContext.cpp

@@ -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;

lldb/unittests/Symbol/TestSwiftASTContext.cpp

@@ -71,8 +71,8 @@ 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,
-                                             const llvm::Triple &host) {
+  static std::string GetSwiftStdlibOSDir(const llvm::Triple &target,
+                                         const llvm::Triple &host) {
     return SwiftASTContext::GetSwiftStdlibOSDir(target, host);
   }
 };