Merge pull request #1132 from adrian-prantl/resourcedir-master-2

Fix a use-after-free in GetSwiftStdlibOSDir.

Author: fredriss

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -1228,7 +1228,7 @@ class SwiftASTContext : public TypeSystemSwift {
   void RemapClangImporterOptions(const PathMappingList &path_map);
 
   /// Infer the appropriate Swift resource directory for a target triple.
-  std::string GetResourceDir(const llvm::Triple &target);
+  llvm::StringRef GetResourceDir(const llvm::Triple &target);
 
   /// Implementation of \c GetResourceDir.
   static std::string GetResourceDir(llvm::StringRef platform_sdk_path,
@@ -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;
@@ -1006,7 +1006,7 @@ StringRef SwiftASTContext::GetSwiftStdlibOSDir(const llvm::Triple &target,
   return target.getOSName();
 }
 
-std::string SwiftASTContext::GetResourceDir(const llvm::Triple &triple) {
+StringRef SwiftASTContext::GetResourceDir(const llvm::Triple &triple) {
   static std::mutex g_mutex;
   std::lock_guard<std::mutex> locker(g_mutex);
   StringRef platform_sdk_path = GetPlatformSDKPath();
@@ -1706,7 +1706,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(lldb::LanguageType language,
   }
 
   triple = swift_ast_sp->GetTriple();
-  std::string resource_dir = swift_ast_sp->GetResourceDir(triple);
+  StringRef resource_dir = swift_ast_sp->GetResourceDir(triple);
   ConfigureResourceDirs(swift_ast_sp->GetCompilerInvocation(),
                         FileSpec(resource_dir), triple);
 
@@ -2014,7 +2014,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(lldb::LanguageType language,
   }
 
   llvm::Triple triple = swift_ast_sp->GetTriple();
-  std::string resource_dir = swift_ast_sp->GetResourceDir(triple);
+  StringRef resource_dir = swift_ast_sp->GetResourceDir(triple);
   ConfigureResourceDirs(swift_ast_sp->GetCompilerInvocation(),
                         FileSpec(resource_dir), triple);
 
@@ -2679,7 +2679,7 @@ void SwiftASTContext::InitializeSearchPathOptions(
   }
 
   llvm::Triple triple(GetTriple());
-  std::string resource_dir = GetResourceDir(triple);
+  StringRef resource_dir = GetResourceDir(triple);
   ConfigureResourceDirs(GetCompilerInvocation(), FileSpec(resource_dir),
                         triple);
 
@@ -3437,7 +3437,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
   // Compute the prebuilt module cache path to use:
   // <resource-dir>/<platform>/prebuilt-modules
   llvm::Triple triple(GetTriple());
-  llvm::SmallString<128> prebuiltModuleCachePath(GetResourceDir(triple));
+  llvm::SmallString<128> prebuiltModuleCachePath = GetResourceDir(triple);
   StringRef platform;
   if (swift::tripleIsMacCatalystEnvironment(triple)) {
     // The prebuilt cache for macCatalyst is the same as the one for macOS,

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);
   }
 };