Add a --symbol-file flag to "delve replay" for external symbols.

cmd/dlv/cmds/commands.go

@@ -100,6 +100,9 @@ var (
 	loadConfErr error
 
 	rrOnProcessPid int
+	// External unstripped executable to use for symbols while replaying an Undo recording.
+	// TODO: Support this for rr backend.
+	replaySymbolFile string
 
 	attachWaitFor         string
 	attachWaitForInterval float64
@@ -427,7 +430,7 @@ Currently supports linux/amd64 and linux/arm64 core files, windows/amd64 minidum
 
 	if rrAvailable || undoAvailable {
 		replayCommand := &cobra.Command{
-			Use:   "replay [trace directory or LiveRecorder recording]",
+			Use:   "replay <trace directory or LiveRecorder recording>",
 			Short: "Replays a rr trace or LiveRecorder recording.",
 			Long: `Replays a rr trace or LiveRecorder recording.
 
@@ -442,12 +445,18 @@ Either Mozilla rr (https://github.com/mozilla/rr) or UDB (https://undo.io) must
 				return nil
 			},
 			Run: func(cmd *cobra.Command, args []string) {
-				if isUndo, _ := gdbserial.UndoIsRecording(args[0]); isUndo {
+				recording := args[0]
+
+				if isUndo, _ := gdbserial.UndoIsRecording(recording); isUndo {
 					backend = "undo"
 				} else {
 					backend = "rr"
+					if replaySymbolFile != "" {
+						fmt.Fprintf(os.Stderr, "Separate symbol file is not supported with rr backend.\n")
+						os.Exit(1)
+					}
 				}
-				os.Exit(execute(0, []string{}, conf, args[0], debugger.ExecutingOther, args, buildFlags))
+				os.Exit(execute(0, []string{replaySymbolFile}, conf, recording, debugger.ExecutingOther, args, buildFlags))
 			},
 			ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 				if len(args) > 2 {
@@ -456,6 +465,7 @@ Either Mozilla rr (https://github.com/mozilla/rr) or UDB (https://undo.io) must
 				return nil, cobra.ShellCompDirectiveDefault
 			},
 		}
+		replayCommand.Flags().StringVarP(&replaySymbolFile, "symbol-file", "", "", "External unstripped executable for debug symbol lookups while replaying a recording.")
 
 		replayCommand.Flags().IntVarP(&rrOnProcessPid, "onprocess", "p", 0,
 			"Pass onprocess pid to rr.")

pkg/proc/gdbserial/gdbserver.go

@@ -687,7 +687,7 @@ func (p *gdbProcess) EntryPoint() (uint64, error) {
 func (p *gdbProcess) initialize(path, cmdline string, debugInfoDirs []string, stopReason proc.StopReason) (*proc.TargetGroup, error) {
 	var err error
 
-	if p.conn.undoSession != nil {
+	if path == "" && p.conn.undoSession != nil {
 		// Always use the path from the recording file, so that we have consistent debug
 		// symbols. Allowing the user to specify other paths is out of scope for now.
 		path, err = undoGetExePath(&p.conn)

pkg/proc/gdbserial/undo.go

@@ -597,7 +597,7 @@ func UndoRecord(cmd []string, wd string, quiet bool, stdin string, stdout proc.O
 	return recording, err
 }
 
-func UndoReplay(recording string, quiet bool, debugInfoDirs []string, cmdline string) (tgt *proc.TargetGroup, err error) {
+func UndoReplay(recording string, exePath string, quiet bool, debugInfoDirs []string, cmdline string) (tgt *proc.TargetGroup, err error) {
 	if err := UndoIsAvailable(); err != nil {
 		return nil, err
 	}
@@ -641,7 +641,7 @@ func UndoReplay(recording string, quiet bool, debugInfoDirs []string, cmdline st
 	p.conn.undoSession = newUndoSession()
 
 	p.tracedir = recording
-	tgt, err = p.Dial(port, "", cmdline, 0, debugInfoDirs, proc.StopAttached)
+	tgt, err = p.Dial(port, exePath, cmdline, 0, debugInfoDirs, proc.StopAttached)
 	if err != nil {
 		servercmd.Process.Kill()
 		return nil, err
@@ -659,7 +659,7 @@ func UndoRecordAndReplay(cmd []string, wd string, quiet bool, debugInfoDirs []st
 	if err != nil || recording == "" {
 		return nil, "", err
 	}
-	tgt, err = UndoReplay(recording, quiet, debugInfoDirs, strings.Join(cmd, " "))
+	tgt, err = UndoReplay(recording, "", quiet, debugInfoDirs, strings.Join(cmd, " "))
 	return tgt, recording, err
 }
 

service/debugger/debugger.go

@@ -202,7 +202,7 @@ func New(config *Config, processArgs []string) (*Debugger, error) {
 			d.target, err = gdbserial.Replay(d.config.CoreFile, false, false, d.config.DebugInfoDirectories, d.config.RrOnProcessPid, "")
 		case "undo":
 			d.log.Infof("opening recording %s", d.config.CoreFile)
-			d.target, err = gdbserial.UndoReplay(d.config.CoreFile, false, d.config.DebugInfoDirectories, "")
+			d.target, err = gdbserial.UndoReplay(d.config.CoreFile, d.processArgs[0], false, d.config.DebugInfoDirectories, "")
 		default:
 			d.log.Infof("opening core file %s (executable %s)", d.config.CoreFile, d.processArgs[0])
 			d.target, err = core.OpenCore(d.config.CoreFile, d.processArgs[0], d.config.DebugInfoDirectories)