Merge commit '10f379e68660' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test

@@ -38,7 +38,7 @@ int main() {
 
 #--- commands.input
 settings set -f frame-format "custom-frame '${function.basename}'\n"
-break set -l 5 -f main.cpp
+break set -n bar
 
 run
 bt

lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test

@@ -29,7 +29,7 @@ int main() { return bar(); }
 
 #--- commands.input
 settings set -f frame-format "custom-frame '${function.template-arguments}'\n"
-break set -l 4 -f main.cpp
+break set -n func
 
 run
 bt