mirror of
				https://github.com/go-delve/delve.git
				synced 2025-10-31 10:47:27 +08:00 
			
		
		
		
	*: remove redundant lines at the start/end of block (#3773)
This commit is contained in:
		| @ -140,7 +140,6 @@ func (T *Table) GetInlineTree(f *Func, goFuncVal, baseaddr uint64, progReader io | |||||||
| 	//goFuncValue := FuncSymName(strver) | 	//goFuncValue := FuncSymName(strver) | ||||||
| 	//return T.go12line.InlineTree(f,goFuncValue,baseaddr,progReader) | 	//return T.go12line.InlineTree(f,goFuncValue,baseaddr,progReader) | ||||||
| 	return T.go12line.InlineTree(f, goFuncVal, baseaddr, progReader) | 	return T.go12line.InlineTree(f, goFuncVal, baseaddr, progReader) | ||||||
|  |  | ||||||
| } | } | ||||||
| func ProgContaining(elfFile *elf.File, addr uint64) *elf.Prog { | func ProgContaining(elfFile *elf.File, addr uint64) *elf.Prog { | ||||||
| 	for _, p := range elfFile.Progs { | 	for _, p := range elfFile.Progs { | ||||||
|  | |||||||
| @ -1039,7 +1039,6 @@ func (stack *evalStack) executeOp() { | |||||||
| 			} else { | 			} else { | ||||||
| 				stack.err = fmt.Errorf("could not find symbol value for %s", op.Name) | 				stack.err = fmt.Errorf("could not find symbol value for %s", op.Name) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 	case *evalop.PushIdent: | 	case *evalop.PushIdent: | ||||||
|  | |||||||
| @ -6305,7 +6305,6 @@ func TestRangeOverFuncNext(t *testing.T) { | |||||||
| 			f, ln2 = currentLineNumber(p, t) | 			f, ln2 = currentLineNumber(p, t) | ||||||
| 			if ln2 != n { | 			if ln2 != n { | ||||||
| 				t.Fatalf("Program did not continue to correct next location (expected %d) was %s:%d", n, f, ln2) | 				t.Fatalf("Program did not continue to correct next location (expected %d) was %s:%d", n, f, ln2) | ||||||
|  |  | ||||||
| 			} | 			} | ||||||
| 		}} | 		}} | ||||||
| 	} | 	} | ||||||
| @ -6365,7 +6364,6 @@ func TestRangeOverFuncNext(t *testing.T) { | |||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	withTestProcessArgs("rangeoverfunc", t, ".", []string{}, 0, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { | 	withTestProcessArgs("rangeoverfunc", t, ".", []string{}, 0, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { | ||||||
|  |  | ||||||
| 		t.Run("TestTrickyIterAll1", func(t *testing.T) { | 		t.Run("TestTrickyIterAll1", func(t *testing.T) { | ||||||
| 			testseq2intl(t, fixture, grp, p, nil, []seqTest{ | 			testseq2intl(t, fixture, grp, p, nil, []seqTest{ | ||||||
| 				funcBreak(t, "main.TestTrickyIterAll"), | 				funcBreak(t, "main.TestTrickyIterAll"), | ||||||
| @ -6889,7 +6887,6 @@ func TestRangeOverFuncNextInlined(t *testing.T) { | |||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	withTestProcessArgs("rangeoverfunc", t, ".", []string{}, protest.EnableInlining, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { | 	withTestProcessArgs("rangeoverfunc", t, ".", []string{}, protest.EnableInlining, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { | ||||||
|  |  | ||||||
| 		t.Run("TestTrickyIterAll1", func(t *testing.T) { | 		t.Run("TestTrickyIterAll1", func(t *testing.T) { | ||||||
| 			testseq2intl(t, fixture, grp, p, nil, []seqTest{ | 			testseq2intl(t, fixture, grp, p, nil, []seqTest{ | ||||||
| 				funcBreak(t, "main.TestTrickyIterAll"), | 				funcBreak(t, "main.TestTrickyIterAll"), | ||||||
|  | |||||||
| @ -494,7 +494,6 @@ func (d *Debugger) Restart(rerecord bool, pos string, resetArgs bool, newArgs [] | |||||||
|  |  | ||||||
| 	if !resetArgs && (d.config.Stdout.File != nil || d.config.Stderr.File != nil) { | 	if !resetArgs && (d.config.Stdout.File != nil || d.config.Stderr.File != nil) { | ||||||
| 		return nil, ErrCanNotRestart | 		return nil, ErrCanNotRestart | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	if err := d.detach(true); err != nil { | 	if err := d.detach(true); err != nil { | ||||||
| @ -1547,7 +1546,6 @@ func traverse(t proc.ValidTargets, f *proc.Function, depth int, followCalls int) | |||||||
| 					TraceMap[cf.Name] = childnode | 					TraceMap[cf.Name] = childnode | ||||||
| 					queue = append(queue, childnode) | 					queue = append(queue, childnode) | ||||||
| 				} | 				} | ||||||
|  |  | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @ -2001,7 +1999,6 @@ func (d *Debugger) convertDefers(defers []*proc.Defer) []api.Defer { | |||||||
| 				SP: defers[i].SP, | 				SP: defers[i].SP, | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	return r | 	return r | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Oleksandr Redko
					Oleksandr Redko