Go 1.11.1 support (version bump to GopherJS 1.11-2).

dmitshur · dmitshur · commit ad455b690e8a · 2018-10-03T00:48:33.000-04:00
Go 1.11.1 has been released recently. It includes some changes to the reflect package, including: - golang/go@a2f1c8e - golang/go@3afa9df - golang/go@58c9bd9 The second commit makes some changes to internal reflect code that makes GopherJS reflect overrides no longer compatible, causing the package to no longer build: $ gopherjs build reflect /usr/local/go/src/reflect/value.go:673:60: cannot use t (variable of type *rtype) as *funcType value in argument to funcLayout /usr/local/go/src/reflect/value.go:336:21: cannot use methodReceiver(op, v, int(v.flag) >> flagMethodShift) (value of type *rtype) as *funcType value in assignment Specifically, the type of return value t of function methodReceiver was changed from *rtype to *funcType in commit golang/go@3afa9df. This change updates the native reflect override for methodReceiver function and Value.call method accordingly. Regenerate natives with: go generate ./compiler/natives Use Go 1.11.1 in CI. Bump GopherJS version to GopherJS 1.11-2. Fixes #862.
diff --git a/circle.yml b/circle.yml
@@ -6,7 +6,7 @@ machine:
 
 dependencies:
   pre:
-    - cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz | sudo tar -xz && sudo chmod a+w go/src/path/filepath
+    - cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.11.1.linux-amd64.tar.gz | sudo tar -xz && sudo chmod a+w go/src/path/filepath
   post:
     - mv ./gopherjs $HOME/bin
     - npm install --global node-gyp
diff --git a/compiler/natives/fs_vfsdata.go b/compiler/natives/fs_vfsdata.go
diff --git a/compiler/natives/src/reflect/reflect.go b/compiler/natives/src/reflect/reflect.go
@@ -647,7 +647,7 @@ func Copy(dst, src Value) int {
 	return js.Global.Call("$copySlice", dstVal, srcVal).Int()
 }
 
-func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer) {
+func methodReceiver(op string, v Value, i int) (_ *rtype, t *funcType, fn unsafe.Pointer) {
 	var prop string
 	if v.typ.Kind() == Interface {
 		tt := (*interfaceType)(unsafe.Pointer(v.typ))
@@ -658,7 +658,7 @@ func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer)
 		if !tt.nameOff(m.name).isExported() {
 			panic("reflect: " + op + " of unexported method")
 		}
-		t = tt.typeOff(m.typ)
+		t = (*funcType)(unsafe.Pointer(tt.typeOff(m.typ)))
 		prop = tt.nameOff(m.name).name()
 	} else {
 		ms := v.typ.exportedMethods()
@@ -669,7 +669,7 @@ func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer)
 		if !v.typ.nameOff(m.name).isExported() {
 			panic("reflect: " + op + " of unexported method")
 		}
-		t = v.typ.typeOff(m.mtyp)
+		t = (*funcType)(unsafe.Pointer(v.typ.typeOff(m.mtyp)))
 		prop = js.Global.Call("$methodSet", jsType(v.typ)).Index(i).Get("prop").String()
 	}
 	rcvr := v.object()
@@ -849,7 +849,7 @@ var callHelper = js.Global.Get("$call").Interface().(func(...interface{}) *js.Ob
 
 func (v Value) call(op string, in []Value) []Value {
 	var (
-		t    *rtype
+		t    *funcType
 		fn   unsafe.Pointer
 		rcvr *js.Object
 	)
@@ -860,7 +860,7 @@ func (v Value) call(op string, in []Value) []Value {
 			rcvr = jsType(v.typ).New(rcvr)
 		}
 	} else {
-		t = v.typ
+		t = (*funcType)(unsafe.Pointer(v.typ))
 		fn = unsafe.Pointer(v.object().Unsafe())
 		rcvr = js.Undefined
 	}
diff --git a/compiler/version_check.go b/compiler/version_check.go
@@ -6,4 +6,4 @@ package compiler
 const ___GOPHERJS_REQUIRES_GO_VERSION_1_11___ = true
 
 // Version is the GopherJS compiler version string.
-const Version = "1.11-1"
+const Version = "1.11-2"

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ func Copy(dst, src Value) int {`
`647`	`647`	`return js.Global.Call("$copySlice", dstVal, srcVal).Int()`
`648`	`648`	`}`
`649`	`649`
`650`		`-func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer) {`
	`650`	`+func methodReceiver(op string, v Value, i int) (_ rtype, t funcType, fn unsafe.Pointer) {`
`651`	`651`	`var prop string`
`652`	`652`	`if v.typ.Kind() == Interface {`
`653`	`653`	`tt := (*interfaceType)(unsafe.Pointer(v.typ))`
`@@ -658,7 +658,7 @@ func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer)`
`658`	`658`	`if !tt.nameOff(m.name).isExported() {`
`659`	`659`	`panic("reflect: " + op + " of unexported method")`
`660`	`660`	`}`
`661`		`- t = tt.typeOff(m.typ)`
	`661`	`+ t = (*funcType)(unsafe.Pointer(tt.typeOff(m.typ)))`
`662`	`662`	`prop = tt.nameOff(m.name).name()`
`663`	`663`	`} else {`
`664`	`664`	`ms := v.typ.exportedMethods()`
`@@ -669,7 +669,7 @@ func methodReceiver(op string, v Value, i int) (_, t *rtype, fn unsafe.Pointer)`
`669`	`669`	`if !v.typ.nameOff(m.name).isExported() {`
`670`	`670`	`panic("reflect: " + op + " of unexported method")`
`671`	`671`	`}`
`672`		`- t = v.typ.typeOff(m.mtyp)`
	`672`	`+ t = (*funcType)(unsafe.Pointer(v.typ.typeOff(m.mtyp)))`
`673`	`673`	`prop = js.Global.Call("$methodSet", jsType(v.typ)).Index(i).Get("prop").String()`
`674`	`674`	`}`
`675`	`675`	`rcvr := v.object()`
`@@ -849,7 +849,7 @@ var callHelper = js.Global.Get("$call").Interface().(func(...interface{}) *js.Ob`
`849`	`849`
`850`	`850`	`func (v Value) call(op string, in []Value) []Value {`
`851`	`851`	`var (`
`852`		`- t *rtype`
	`852`	`+ t *funcType`
`853`	`853`	`fn unsafe.Pointer`
`854`	`854`	`rcvr *js.Object`
`855`	`855`	`)`
`@@ -860,7 +860,7 @@ func (v Value) call(op string, in []Value) []Value {`
`860`	`860`	`rcvr = jsType(v.typ).New(rcvr)`
`861`	`861`	`}`
`862`	`862`	`} else {`
`863`		`- t = v.typ`
	`863`	`+ t = (*funcType)(unsafe.Pointer(v.typ))`
`864`	`864`	`fn = unsafe.Pointer(v.object().Unsafe())`
`865`	`865`	`rcvr = js.Undefined`
`866`	`866`	`}`