Skip to content

Commit 7b91624

Browse files
committed
cmd/compile: rename init function from init.ializers back to init
The name change init -> init.ializers was initially required for initialization code. With CL 161337 there's no wrapper code any more, there's a data structure instead (named .inittask). So we can go back to just plain init appearing in tracebacks. RELNOTE=yes Update #29919. Followon to CL 161337. Change-Id: I5a4a49d286df24b53b2baa193dfda482f3ea82a5 Reviewed-on: https://go-review.googlesource.com/c/go/+/167780 Run-TryBot: Keith Randall <[email protected]> Reviewed-by: Josh Bleecher Snyder <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 27e444d commit 7b91624

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/cmd/compile/internal/gc/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func fninit(n []*Node) {
4646
// Make a function that contains all the initialization statements.
4747
if len(nf) > 0 {
4848
lineno = nf[0].Pos // prolog/epilog gets line number of first init stmt
49-
initializers := lookup("init.ializers")
49+
initializers := lookup("init")
5050
disableExport(initializers)
5151
fn := dclfunc(initializers, nod(OTFUNC, nil, nil))
5252
for _, dcl := range dummyInitFn.Func.Dcl {

src/fmt/errors_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestErrorFormatter(t *testing.T) {
157157
want: "fallback:" +
158158
"\n somefile.go:123" +
159159
"\n - file does not exist:" +
160-
"\n os.init.ializers" +
160+
"\n os.init" +
161161
"\n .+/os/error.go:\\d\\d",
162162
regexp: true,
163163
}, {

test/fixedbugs/issue29919.dir/a.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ func f() int {
3434
if !strings.Contains(s, "a.go:19") {
3535
panic("missing a.go:19")
3636
}
37-
if !strings.Contains(s, "a.init.ializers") {
38-
panic("missing a.init.ializers")
37+
if !strings.Contains(s, "a.init") {
38+
panic("missing a.init")
3939
}
4040

4141
// Check the CallersFrames results.
@@ -58,11 +58,11 @@ func f() int {
5858
panic("traceback truncated after f")
5959
}
6060
f, more = iter.Next()
61-
if f.Function != "a.init.ializers" || !strings.HasSuffix(f.File, "a.go") || f.Line != 15 {
62-
panic(fmt.Sprintf("bad init.ializers %v\n", f))
61+
if f.Function != "a.init" || !strings.HasSuffix(f.File, "a.go") || f.Line != 15 {
62+
panic(fmt.Sprintf("bad init %v\n", f))
6363
}
6464
if !more {
65-
panic("traceback truncated after init.ializers")
65+
panic("traceback truncated after init")
6666
}
6767
f, _ = iter.Next()
6868
if !strings.HasPrefix(f.Function, "runtime.") {

0 commit comments

Comments
 (0)