Author: Jonas Devlieghere Date: 2021-02-11T20:23:53-08:00 New Revision: 4d3a061c32ee5c4fb88be389a4dd7fd71fc9fa9c
URL: https://github.com/llvm/llvm-project/commit/4d3a061c32ee5c4fb88be389a4dd7fd71fc9fa9c DIFF: https://github.com/llvm/llvm-project/commit/4d3a061c32ee5c4fb88be389a4dd7fd71fc9fa9c.diff LOG: [lldb] Fix 'r' and 'run' aliases on Apple Silicon The 'r' and 'run' aliases were different based on the target architecture. I suspect the intention was to disable shell expansion on embedded devices. This fixes TestCustomShell.test on AS. Added: Modified: lldb/source/Interpreter/CommandInterpreter.cpp lldb/test/Shell/Host/TestCustomShell.test Removed: ################################################################################ diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index a7afa1034762..f0a6baa3b9ad 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -417,24 +417,20 @@ void CommandInterpreter::Initialize() { cmd_obj_sp = GetCommandSPExact("process launch"); if (cmd_obj_sp) { alias_arguments_vector_sp = std::make_shared<OptionArgVector>(); -#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__) +#if defined(__APPLE__) +#if defined(TARGET_OS_IPHONE) AddAlias("r", cmd_obj_sp, "--"); AddAlias("run", cmd_obj_sp, "--"); #else -#if defined(__APPLE__) - std::string shell_option; - shell_option.append("--shell-expand-args"); - shell_option.append(" true"); - shell_option.append(" --"); AddAlias("r", cmd_obj_sp, "--shell-expand-args true --"); AddAlias("run", cmd_obj_sp, "--shell-expand-args true --"); +#endif #else StreamString defaultshell; defaultshell.Printf("--shell=%s --", HostInfo::GetDefaultShell().GetPath().c_str()); AddAlias("r", cmd_obj_sp, defaultshell.GetString()); AddAlias("run", cmd_obj_sp, defaultshell.GetString()); -#endif #endif } diff --git a/lldb/test/Shell/Host/TestCustomShell.test b/lldb/test/Shell/Host/TestCustomShell.test index 75114c554493..1823d094ea7a 100644 --- a/lldb/test/Shell/Host/TestCustomShell.test +++ b/lldb/test/Shell/Host/TestCustomShell.test @@ -1,7 +1,5 @@ -# This test applies to POSIX. -# UNSUPPORTED: system-windows - # FIXME: ShellExpandArguments is unimplemented on the following targets. +# UNSUPPORTED: system-windows # UNSUPPORTED: system-linux # XFAIL: system-freebsd # XFAIL: system-netbsd _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
