Merge pull request #1510 from Teemperor/FixBuild20Jul2020

fredriss · web-flow · commit 500b8afd28a9 · 2020-07-20T08:41:20.000-07:00
[lldb] Fix compile error due implicit StringRef -&gt; std::string conversion
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -1273,7 +1273,7 @@ OptionalClangModuleID TypeSystemClang::GetOrCreateClangModule(
   if (!created)
     return ast_source->GetIDForModule(module);
 
-  module->APINotesFile = apinotes;
+  module->APINotesFile = std::string(apinotes);
   return ast_source->RegisterModule(module);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1273,7 +1273,7 @@ OptionalClangModuleID TypeSystemClang::GetOrCreateClangModule(`
`1273`	`1273`	`if (!created)`
`1274`	`1274`	`return ast_source->GetIDForModule(module);`
`1275`	`1275`
`1276`		`- module->APINotesFile = apinotes;`
	`1276`	`+ module->APINotesFile = std::string(apinotes);`
`1277`	`1277`	`return ast_source->RegisterModule(module);`
`1278`	`1278`	`}`
`1279`	`1279`