test: fix nosplit test, and disable nilptr3 test on arm64

Change-Id: I5d40e04395de743a8fdcfa8bdc0e580729bc66a3
Reviewed-on: https://go-review.googlesource.com/7147
Reviewed-by: Minux Ma <minux@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/test/nilptr3.go b/test/nilptr3.go
index cf26993ef9581a01a790cffe53cb9b1a7b0268e9..a62b26240709d4bab16bd800b15e0033796fa5e8 100644 (file)
--- a/test/nilptr3.go
+++ b/test/nilptr3.go
@@ -1,6 +1,7 @@
 // errorcheck -0 -d=nil
-// Fails on ppc64x because of incomplete optimization.  See issue 9058.
-// +build !ppc64,!ppc64le
+// Fails on ppc64x and arm64 because of incomplete optimization.
+// See issues 9058 and 10105.
+// +build !ppc64,!ppc64le,!arm64
 
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style

diff --git a/test/nosplit.go b/test/nosplit.go
index 0bd13c1db4150e8d6514531c30054f61b15bad25..bd4e60bc1345ac70972c3468b3dfe7a3f3d919b0 100644 (file)
--- a/test/nosplit.go
+++ b/test/nosplit.go
@@ -261,6 +261,9 @@ TestCases:
                        fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (CTR)\n#define RET RETURN\n")
                case "arm":
                        fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
+               case "arm64":
+                       ptrSize = 8
+                       fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
                case "amd64":
                        ptrSize = 8
                        fmt.Fprintf(&buf, "#define REGISTER AX\n")