Out-param SmallVectorImpl<char>

Author: jansvoboda11

clang/include/clang/Frontend/CompilerInstance.h

@@ -699,8 +699,8 @@ class CompilerInstance : public ModuleLoader {
     GetDependencyDirectives = std::move(Getter);
   }
 
-  static SmallString<256> normalizeModuleCachePath(FileManager &FileMgr,
-                                                   StringRef ModuleCachePath);
+  static void normalizeModuleCachePath(FileManager &FileMgr, StringRef Path,
+                                       SmallVectorImpl<char> &NormalizedPath);
   std::string getSpecificModuleCachePath(StringRef ModuleHash);
   std::string getSpecificModuleCachePath() {
     return getSpecificModuleCachePath(getInvocation().getModuleHash());

clang/lib/Frontend/CompilerInstance.cpp

@@ -547,13 +547,12 @@ void CompilerInstance::createPreprocessor(TranslationUnitKind TUKind) {
     PP->setDependencyDirectivesGetter(*GetDependencyDirectives);
 }
 
-SmallString<256>
-CompilerInstance::normalizeModuleCachePath(FileManager &FileMgr,
-                                           StringRef ModuleCachePath) {
-  SmallString<256> NormalizedModuleCachePath(ModuleCachePath);
-  FileMgr.makeAbsolutePath(NormalizedModuleCachePath);
-  llvm::sys::path::remove_dots(NormalizedModuleCachePath);
-  return NormalizedModuleCachePath;
+void CompilerInstance::normalizeModuleCachePath(
+    FileManager &FileMgr, StringRef Path,
+    SmallVectorImpl<char> &NormalizedPath) {
+  NormalizedPath.assign(Path.begin(), Path.end());
+  FileMgr.makeAbsolutePath(NormalizedPath);
+  llvm::sys::path::remove_dots(NormalizedPath);
 }
 
 std::string CompilerInstance::getSpecificModuleCachePath(StringRef ModuleHash) {
@@ -563,8 +562,9 @@ std::string CompilerInstance::getSpecificModuleCachePath(StringRef ModuleHash) {
     return "";
 
   // Set up the module path, including the hash for the module-creation options.
-  SmallString<256> SpecificModuleCache =
-      normalizeModuleCachePath(*FileMgr, getHeaderSearchOpts().ModuleCachePath);
+  SmallString<256> SpecificModuleCache;
+  normalizeModuleCachePath(*FileMgr, getHeaderSearchOpts().ModuleCachePath,
+                           SpecificModuleCache);
   if (!getHeaderSearchOpts().DisableModuleHash)
     llvm::sys::path::append(SpecificModuleCache, ModuleHash);
   return std::string(SpecificModuleCache);

clang/lib/Serialization/ASTWriter.cpp

@@ -1711,8 +1711,9 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, StringRef isysroot) {
   const HeaderSearchOptions &HSOpts =
       PP.getHeaderSearchInfo().getHeaderSearchOpts();
 
-  auto HSOpts_ModuleCachePath = CompilerInstance::normalizeModuleCachePath(
-      PP.getFileManager(), HSOpts.ModuleCachePath);
+  SmallString<256> HSOpts_ModuleCachePath;
+  CompilerInstance::normalizeModuleCachePath(
+      PP.getFileManager(), HSOpts.ModuleCachePath, HSOpts_ModuleCachePath);
 
   AddString(HSOpts.Sysroot, Record);
   AddString(HSOpts.ResourceDir, Record);

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -448,8 +448,10 @@ class DependencyScanningAction {
 
     // Use the dependency scanning optimized file system if requested to do so.
     if (DepFS) {
-      auto ModulesCachePath = CompilerInstance::normalizeModuleCachePath(
-          *FileMgr, ScanInstance.getHeaderSearchOpts().ModuleCachePath);
+      SmallString<256> ModulesCachePath;
+      CompilerInstance::normalizeModuleCachePath(
+          *FileMgr, ScanInstance.getHeaderSearchOpts().ModuleCachePath,
+          ModulesCachePath);
       DepFS->resetBypassedPathPrefix();
       if (!ModulesCachePath.empty())
         DepFS->setBypassedPathPrefix(ModulesCachePath);