Merge commit 'cc2beddaa44f' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 44c4b011bef9 · 2025-05-13T15:48:50.000-07:00
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
@@ -1076,7 +1076,7 @@ llvm::Expected<Args> Options::ParseAlias(const Args &args,
 
     if (!input_line.empty()) {
       llvm::StringRef tmp_arg = args_copy[idx].ref();
-      size_t pos = input_line.find(std::string(tmp_arg));
+      size_t pos = input_line.find(tmp_arg);
       if (pos != std::string::npos)
         input_line.erase(pos, tmp_arg.size());
     }

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ llvm::Expected<Args> Options::ParseAlias(const Args &args,`
`1076`	`1076`
`1077`	`1077`	`if (!input_line.empty()) {`
`1078`	`1078`	`llvm::StringRef tmp_arg = args_copy[idx].ref();`
`1079`		`- size_t pos = input_line.find(std::string(tmp_arg));`
	`1079`	`+ size_t pos = input_line.find(tmp_arg);`
`1080`	`1080`	`if (pos != std::string::npos)`
`1081`	`1081`	`input_line.erase(pos, tmp_arg.size());`
`1082`	`1082`	`}`