Merge pull request #1064 from nevkontakte/wip-go1.17

nevkontakte · web-flow · commit f7183f92cf99 · 2021-09-18T10:53:01.000+01:00
Resolve the two remaining gorepo test failures.
diff --git a/compiler/prelude/prelude_min.go b/compiler/prelude/prelude_min.go
diff --git a/compiler/prelude/types.go b/compiler/prelude/types.go
@@ -482,7 +482,7 @@ var $Float64       = $newType( 8, $kindFloat64,       "float64",        true, ""
 var $Complex64     = $newType( 8, $kindComplex64,     "complex64",      true, "", false, null);
 var $Complex128    = $newType(16, $kindComplex128,    "complex128",     true, "", false, null);
 var $String        = $newType( 8, $kindString,        "string",         true, "", false, null);
-var $UnsafePointer = $newType( 4, $kindUnsafePointer, "unsafe.Pointer", true, "", false, null);
+var $UnsafePointer = $newType( 4, $kindUnsafePointer, "unsafe.Pointer", true, "unsafe", false, null);
 
 var $nativeArray = function(elemKind) {
   switch (elemKind) {
diff --git a/compiler/utils.go b/compiler/utils.go
@@ -145,7 +145,7 @@ func (fc *funcContext) translateSelection(sel selection, pos token.Pos) ([]strin
 	var fields []string
 	t := sel.Recv()
 	for _, index := range sel.Index() {
-		if ptr, isPtr := t.(*types.Pointer); isPtr {
+		if ptr, isPtr := t.Underlying().(*types.Pointer); isPtr {
 			t = ptr.Elem()
 		}
 		s := t.Underlying().(*types.Struct)
diff --git a/tests/gorepo/run.go b/tests/gorepo/run.go
@@ -147,6 +147,7 @@ var knownFails = map[string]failReason{
 	"fixedbugs/issue5493.go":  {category: notApplicable, desc: "GC related, not relevant to GopherJS"},
 	"fixedbugs/issue46725.go": {category: notApplicable, desc: "GC related, not relevant to GopherJS"},
 	"fixedbugs/issue43444.go": {category: lowLevelRuntimeDifference, desc: "GopherJS println format is different from Go's"},
+	"fixedbugs/issue23017.go": {desc: "https://github.com/gopherjs/gopherjs/issues/1063"},
 }
 
 type failCategory uint8

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (fc *funcContext) translateSelection(sel selection, pos token.Pos) ([]strin`
`145`	`145`	`var fields []string`
`146`	`146`	`t := sel.Recv()`
`147`	`147`	`for _, index := range sel.Index() {`
`148`		`- if ptr, isPtr := t.(*types.Pointer); isPtr {`
	`148`	`+ if ptr, isPtr := t.Underlying().(*types.Pointer); isPtr {`
`149`	`149`	`t = ptr.Elem()`
`150`	`150`	`}`
`151`	`151`	`s := t.Underlying().(*types.Struct)`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ var knownFails = map[string]failReason{`
`147`	`147`	`"fixedbugs/issue5493.go": {category: notApplicable, desc: "GC related, not relevant to GopherJS"},`
`148`	`148`	`"fixedbugs/issue46725.go": {category: notApplicable, desc: "GC related, not relevant to GopherJS"},`
`149`	`149`	`"fixedbugs/issue43444.go": {category: lowLevelRuntimeDifference, desc: "GopherJS println format is different from Go's"},`
	`150`	`+ "fixedbugs/issue23017.go": {desc: "https://github.com/gopherjs/gopherjs/issues/1063"},`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`type failCategory uint8`