Merge pull request #61154 from apple/egorzhdan/cxxstdlib-asan-fix

egorzhdan · web-flow · commit 826adfd76588 · 2022-09-16T16:45:06.000+01:00
[cxx-interop] Fix ASAN error
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -2006,7 +2006,7 @@ ModuleDecl *ClangImporter::Implementation::loadModule(
   if (path.front().Item == ctx.Id_CxxStdlib) {
     ImportPath::Builder adjustedPath(ctx.getIdentifier("std"), importLoc);
     adjustedPath.append(path.getSubmodulePath());
-    path = adjustedPath.get().getModulePath(ImportKind::Module);
+    path = adjustedPath.copyTo(ctx).getModulePath(ImportKind::Module);
   }
 
   if (!DisableSourceImport)

Original file line number	Diff line number	Diff line change
`@@ -2006,7 +2006,7 @@ ModuleDecl *ClangImporter::Implementation::loadModule(`
`2006`	`2006`	`if (path.front().Item == ctx.Id_CxxStdlib) {`
`2007`	`2007`	`ImportPath::Builder adjustedPath(ctx.getIdentifier("std"), importLoc);`
`2008`	`2008`	`adjustedPath.append(path.getSubmodulePath());`
`2009`		`- path = adjustedPath.get().getModulePath(ImportKind::Module);`
	`2009`	`+ path = adjustedPath.copyTo(ctx).getModulePath(ImportKind::Module);`
`2010`	`2010`	`}`
`2011`	`2011`
`2012`	`2012`	`if (!DisableSourceImport)`