Merge commit '311c8b352133' from swift/release/6.0 into stable/20230725

git apple-llvm automerger · git apple-llvm automerger · commit 05d0d30c9711 · 2024-08-15T09:39:31.000-06:00
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -5226,10 +5226,10 @@ uint32_t ObjectFileMachO::GetDependentModules(FileSpecList &files) {
       for (auto &rpath : rpath_paths) {
         if (llvm::StringRef(rpath).startswith(loader_path)) {
           rpath.erase(0, loader_path.size());
-          rpath.insert(0, this_file_spec.GetDirectory().GetCString());
+          rpath.insert(0, this_file_spec.GetDirectory().AsCString(""));
         } else if (llvm::StringRef(rpath).startswith(executable_path)) {
           rpath.erase(0, executable_path.size());
-          rpath.insert(0, this_file_spec.GetDirectory().GetCString());
+          rpath.insert(0, this_file_spec.GetDirectory().AsCString(""));
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -5226,10 +5226,10 @@ uint32_t ObjectFileMachO::GetDependentModules(FileSpecList &files) {`
`5226`	`5226`	`for (auto &rpath : rpath_paths) {`
`5227`	`5227`	`if (llvm::StringRef(rpath).startswith(loader_path)) {`
`5228`	`5228`	`rpath.erase(0, loader_path.size());`
`5229`		`- rpath.insert(0, this_file_spec.GetDirectory().GetCString());`
	`5229`	`+ rpath.insert(0, this_file_spec.GetDirectory().AsCString(""));`
`5230`	`5230`	`} else if (llvm::StringRef(rpath).startswith(executable_path)) {`
`5231`	`5231`	`rpath.erase(0, executable_path.size());`
`5232`		`- rpath.insert(0, this_file_spec.GetDirectory().GetCString());`
	`5232`	`+ rpath.insert(0, this_file_spec.GetDirectory().AsCString(""));`
`5233`	`5233`	`}`
`5234`	`5234`	`}`
`5235`	`5235`