slogging through reflect

Author: grantnelson-wf

compiler/natives/src/internal/abi/type.go

@@ -235,17 +235,22 @@ func (typ *Type) IsWrapped() bool {
 //gopherjs:new
 var jsObjectPtr = ReflectType(js.Global.Get("$jsObjectPtr"))
 
+//gopherjs:new
+func IsJsObjectPtr(typ *Type) bool {
+	return typ == jsObjectPtr
+}
+
 //gopherjs:new
 func WrapJsObject(typ *Type, val *js.Object) *js.Object {
-	if typ == jsObjectPtr {
+	if IsJsObjectPtr(typ) {
 		return jsObjectPtr.JsType().New(val)
 	}
 	return val
 }
 
 //gopherjs:new
 func UnwrapJsObject(typ *Type, val *js.Object) *js.Object {
-	if typ == jsObjectPtr {
+	if IsJsObjectPtr(typ) {
 		return val.Get("object")
 	}
 	return val

compiler/natives/src/internal/abi/utils.go

@@ -2,6 +2,12 @@
 
 package abi
 
+import (
+	"unsafe"
+
+	"github.com/gopherjs/gopherjs/js"
+)
+
 // GOPHERJS: These utils are being added because they are common between
 // reflect and reflectlite.
 
@@ -78,3 +84,25 @@ func GetJsTag(tag string) string {
 	}
 	return ""
 }
+
+//gopherjs:new
+func UnsafeNew(typ *Type) unsafe.Pointer {
+	switch typ.Kind() {
+	case Struct:
+		return unsafe.Pointer(typ.JsType().Get("ptr").New().Unsafe())
+	case Array:
+		return unsafe.Pointer(typ.JsType().Call("zero").Unsafe())
+	default:
+		return unsafe.Pointer(js.Global.Call("$newDataPointer", typ.JsType().Call("zero"), typ.JsPtrTo()).Unsafe())
+	}
+}
+
+//gopherjs:new
+func IfaceE2I(t *Type, src any, dst unsafe.Pointer) {
+	js.InternalObject(dst).Call("$set", js.InternalObject(src))
+}
+
+//gopherjs:new
+func TypedMemMove(t *Type, dst, src unsafe.Pointer) {
+	js.InternalObject(dst).Call("$set", js.InternalObject(src).Call("$get"))
+}

compiler/natives/src/internal/reflectlite/reflectlite.go

@@ -10,6 +10,36 @@ import (
 	"github.com/gopherjs/gopherjs/js"
 )
 
+func init() {
+	// avoid dead code elimination
+	used := func(i any) {}
+	used(rtype{})
+	used(uncommonType{})
+	used(arrayType{})
+	used(chanType{})
+	used(funcType{})
+	used(interfaceType{})
+	used(mapType{})
+	used(ptrType{})
+	used(sliceType{})
+	used(structType{})
+}
+
+//gopherjs:new
+func toAbiType(t Type) *abi.Type {
+	return t.(rtype).common()
+}
+
+//gopherjs:new
+func jsType(t Type) *js.Object {
+	return toAbiType(t).JsType()
+}
+
+//gopherjs:new
+func jsPtrTo(t Type) *js.Object {
+	return toAbiType(t).JsPtrTo()
+}
+
 // GOPHERJS: For some reason the original code left mapType and aliased the rest
 // to the ABI version. mapType is not used so this is an alias to override the
 // left over refactor cruft.

compiler/natives/src/internal/reflectlite/type.go

@@ -204,10 +204,10 @@ func (v Value) Field(i int) Value {
 	}
 
 	if tag := tt.Fields[i].Name.Tag(); tag != "" && i != 0 {
-		if jsTag := getJsTag(tag); jsTag != "" {
+		if jsTag := abi.GetJsTag(tag); jsTag != "" {
 			for {
 				v = v.Field(0)
-				if v.typ == jsObjectPtr {
+				if abi.IsJsObjectPtr(v.typ) {
 					o := v.object().Get("object")
 					return Value{
 						typ: typ,
@@ -241,14 +241,7 @@ func (v Value) Field(i int) Value {
 
 //gopherjs:replace
 func unsafe_New(typ *abi.Type) unsafe.Pointer {
-	switch typ.Kind() {
-	case abi.Struct:
-		return unsafe.Pointer(typ.JsType().Get("ptr").New().Unsafe())
-	case abi.Array:
-		return unsafe.Pointer(typ.JsType().Call("zero").Unsafe())
-	default:
-		return unsafe.Pointer(js.Global.Call("$newDataPointer", typ.JsType().Call("zero"), typ.JsPtrTo()).Unsafe())
-	}
+	return abi.UnsafeNew(typ)
 }
 
 //gopherjs:replace
@@ -350,10 +343,10 @@ func (v Value) assignTo(context string, dst *abi.Type, target unsafe.Pointer) Va
 
 //gopherjs:replace
 func ifaceE2I(t *abi.Type, src any, dst unsafe.Pointer) {
-	js.InternalObject(dst).Call("$set", js.InternalObject(src))
+	abi.IfaceE2I(t, src, dst)
 }
 
 //gopherjs:replace
 func typedmemmove(t *abi.Type, dst, src unsafe.Pointer) {
-	js.InternalObject(dst).Call("$set", js.InternalObject(src).Call("$get"))
+	abi.TypedMemMove(t, dst, src)
 }