Skip to content

Commit

Permalink
test/codegen: port structs test to codegen
Browse files Browse the repository at this point in the history
And delete them from asm_test.

Change-Id: Ia286239a3d8f3915f2ca25dbcb39f3354a4f8aea
Reviewed-on: https://go-review.googlesource.com/101138
Run-TryBot: Alberto Donizetti <alb.donizetti@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
  • Loading branch information
ALTree committed Mar 18, 2018
1 parent cc155eb commit b61b1d2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 37 deletions.
37 changes: 0 additions & 37 deletions src/cmd/compile/internal/gc/asm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,43 +279,6 @@ var linuxAMD64Tests = []*asmTest{
`,
pos: []string{"\tSHLQ\t\\$5,", "\tLEAQ\t\\(.*\\)\\(.*\\*2\\),"},
},
// Structure zeroing. See issue #18370.
{
fn: `
type T1 struct {
a, b, c int
}
func $(t *T1) {
*t = T1{}
}
`,
pos: []string{"\tXORPS\tX., X", "\tMOVUPS\tX., \\(.*\\)", "\tMOVQ\t\\$0, 16\\(.*\\)"},
},
// SSA-able composite literal initialization. Issue 18872.
{
fn: `
type T18872 struct {
a, b, c, d int
}
func f18872(p *T18872) {
*p = T18872{1, 2, 3, 4}
}
`,
pos: []string{"\tMOVQ\t[$]1", "\tMOVQ\t[$]2", "\tMOVQ\t[$]3", "\tMOVQ\t[$]4"},
},
// Also test struct containing pointers (this was special because of write barriers).
{
fn: `
type T2 struct {
a, b, c *int
}
func f19(t *T2) {
*t = T2{}
}
`,
pos: []string{"\tXORPS\tX., X", "\tMOVUPS\tX., \\(.*\\)", "\tMOVQ\t\\$0, 16\\(.*\\)", "\tCALL\truntime\\.gcWriteBarrier\\(SB\\)"},
},
{
fn: `
func f33(m map[int]int) int {
Expand Down
46 changes: 46 additions & 0 deletions test/codegen/structs.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// asmcheck

// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package codegen

// This file contains code generation tests related to the handling of
// struct types.

// ------------- //
// Zeroing //
// ------------- //

type Z1 struct {
a, b, c int
}

func Zero1(t *Z1) { // Issue #18370
// amd64:`XORPS\tX., X`,`MOVUPS\tX., \(.*\)`,`MOVQ\t\$0, 16\(.*\)`
*t = Z1{}
}

type Z2 struct {
a, b, c *int
}

func Zero2(t *Z2) {
// amd64:`XORPS\tX., X`,`MOVUPS\tX., \(.*\)`,`MOVQ\t\$0, 16\(.*\)`
// amd64:`.*runtime[.]gcWriteBarrier\(SB\)`
*t = Z2{}
}

// ------------------ //
// Initializing //
// ------------------ //

type I1 struct {
a, b, c, d int
}

func Init1(p *I1) { // Issue #18872
// amd64:`MOVQ\t[$]1`,`MOVQ\t[$]2`,`MOVQ\t[$]3`,`MOVQ\t[$]4`
*p = I1{1, 2, 3, 4}
}

0 comments on commit b61b1d2

Please sign in to comment.