Handling strict conversion criteria for StringRef to std::string from TOT llvm.

plotfi · MForster · commit 8132596e8311 · 2020-03-13T19:08:22.000+01:00
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
@@ -906,7 +906,7 @@ static bool passCursorInfoForDecl(SourceFile* SF,
     if (ClangMod)
       ModuleName = ClangMod->getFullModuleName();
   } else if (VD->getModuleContext() != MainModule) {
-    ModuleName = VD->getModuleContext()->getName().str();
+    ModuleName = VD->getModuleContext()->getName().str().str();
   }
   StringRef ModuleInterfaceName;
   if (auto IFaceGenRef = Lang.getIFaceGenContexts().find(ModuleName, Invok))

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ static bool passCursorInfoForDecl(SourceFile* SF,`
`906`	`906`	`if (ClangMod)`
`907`	`907`	`ModuleName = ClangMod->getFullModuleName();`
`908`	`908`	`} else if (VD->getModuleContext() != MainModule) {`
`909`		`- ModuleName = VD->getModuleContext()->getName().str();`
	`909`	`+ ModuleName = VD->getModuleContext()->getName().str().str();`
`910`	`910`	`}`
`911`	`911`	`StringRef ModuleInterfaceName;`
`912`	`912`	`if (auto IFaceGenRef = Lang.getIFaceGenContexts().find(ModuleName, Invok))`