We need to prepend the module name to the function name used to script LLDB commands.

Author: rocallahan

src/DebuggerExtensionCommandHandler.cc

@@ -192,6 +192,7 @@ end
 }
 
 static void lldb_macro_binding(ostream& def_stream, ostream& call_stream,
+                               const string* module_name,
                                const DebuggerExtensionCommand& cmd) {
   string func_name = "rr_command_";
   for (char ch : cmd.name()) {
@@ -214,12 +215,15 @@ static void lldb_macro_binding(ostream& def_stream, ostream& call_stream,
   def_stream << "\n"
              << "    command_impl(debugger, command, exe_ctx, result, cmd_name, auto_args)\n"
              << "\n";
-  call_stream << "    debugger.HandleCommand('command script add -f " << func_name
-              << " " << cmd.name() << "')\n";
+  call_stream << "    debugger.HandleCommand('command script add -f ";
+  if (module_name) {
+    call_stream << *module_name << ".";
+  }
+  call_stream << func_name << " " << cmd.name() << "')\n";
 }
 
 DebuggerExtensionCommandHandler::LldbCommands
-DebuggerExtensionCommandHandler::lldb_python_macros() {
+DebuggerExtensionCommandHandler::lldb_python_macros(const string* module_name) {
   DebuggerExtensionCommand::init_auto_args();
   stringstream ss;
   ss << R"Delimiter(import lldb
@@ -259,7 +263,7 @@ def command_impl(debugger, command, exe_ctx, result, cmd_name, auto_args):
   stringstream call_stream;
   if (debugger_command_list) {
     for (auto& it : *debugger_command_list) {
-      lldb_macro_binding(ss, call_stream, *it);
+      lldb_macro_binding(ss, call_stream, module_name, *it);
     }
   }
   LldbCommands cmds;

src/DebuggerExtensionCommandHandler.h

@@ -30,7 +30,7 @@ class DebuggerExtensionCommandHandler {
     // 2-space-indented code to run on startup.
     std::string run_on_startup;
   };
-  static LldbCommands lldb_python_macros();
+  static LldbCommands lldb_python_macros(const string* module_name);
 
   static void register_command(DebuggerExtensionCommand& cmd);
 

src/launch_debugger.cc

@@ -120,11 +120,13 @@ static string gdb_rr_macros(const string* file_to_delete) {
   return ss.str();
 }
 
-static const string& lldb_python_rr_macros(const string* file_to_delete) {
+static const string& lldb_python_rr_macros(
+    const string* file_to_delete, const string* module_name) {
   static string s;
 
   if (s.empty()) {
-    auto cmds = DebuggerExtensionCommandHandler::lldb_python_macros();
+    auto cmds = DebuggerExtensionCommandHandler::lldb_python_macros(
+        module_name);
     stringstream ss;
     ss << cmds.toplevel_definitions
        << "import os\n"
@@ -316,11 +318,11 @@ void launch_debugger(ScopedFd& params_pipe_fd,
                     RENAME_NOREPLACE)) {
         FATAL() << "Can't fix temp file name";
       }
-      file.name = new_name;
-      string script = lldb_python_rr_macros(&file.name);
+      string module_name(basename(file.name.c_str()));
+      string script = lldb_python_rr_macros(&new_name, &module_name);
       write_all(file.fd, script.data(), script.size());
       cmd.push_back("-o");
-      cmd.push_back("command script import " + file.name);
+      cmd.push_back("command script import " + new_name);
       env.push_back("LLDB_UNDER_RR=1");
       break;
     }
@@ -392,6 +394,6 @@ void emergency_debug(Task* t) {
 
 string gdb_init_script() { return gdb_rr_macros(nullptr); }
 
-string lldb_init_script() { return lldb_python_rr_macros(nullptr); }
+string lldb_init_script() { return lldb_python_rr_macros(nullptr, nullptr); }
 
 } // namespace rr