cleaning up some changes

Author: grantnelson-wf

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

@@ -25,7 +25,7 @@ func init() {
 	used(structType{})
 }
 
-// TODO(grantnelson-wf): After this is in the go1.21 branch, remove it, this is just to minimize diffs.
+// TODO(grantnelson-wf): This is just to minimize diffs. After this is merged into the go1.21 branch, remove it.
 func jsType(typ *abi.Type) *js.Object {
 	return typ.JsType()
 }
@@ -40,11 +40,6 @@ func jsPtrTo(t Type) *js.Object {
 	return toAbiType(t).JsPtrTo()
 }
 
-// TODO(grantnelson-wf): After this is in the go1.21 branch, remove it, this is just to minimize diffs.
-func reflectType(typ *js.Object) rtype {
-	return toRType(abi.ReflectType(typ))
-}
-
 //gopherjs:purge The name type is mostly unused, replaced by abi.Name, except in pkgPath which we don't implement.
 type name struct {
 	bytes *byte
@@ -69,40 +64,29 @@ func (t rtype) typeOff(off typeOff) *abi.Type {
 	return t.TypeOff(off)
 }
 
-// TODO(grantnelson-wf): After this is in the go1.21 branch, remove it, this is just to minimize diffs.
-func isWrapped(typ *abi.Type) bool {
-	return typ.IsWrapped()
-}
-
-// TODO(grantnelson-wf): After this is in the go1.21 branch, remove it, this is just to minimize diffs.
-func copyStruct(dst, src *js.Object, typ *abi.Type) {
-	abi.CopyStruct(dst, src, typ)
-}
-
 //gopherjs:new
-func makeValue(t Type, v *js.Object, fl flag) Value {
-	rt := t.common()
+func makeValue(t *abi.Type, v *js.Object, fl flag) Value {
 	switch t.Kind() {
 	case abi.Array, abi.Struct, abi.Pointer:
-		return Value{rt, unsafe.Pointer(v.Unsafe()), fl | flag(t.Kind())}
+		return Value{t, unsafe.Pointer(v.Unsafe()), fl | flag(t.Kind())}
 	}
-	return Value{rt, unsafe.Pointer(js.Global.Call("$newDataPointer", v, rt.JsPtrTo()).Unsafe()), fl | flag(t.Kind()) | flagIndir}
+	return Value{t, unsafe.Pointer(js.Global.Call("$newDataPointer", v, t.JsPtrTo()).Unsafe()), fl | flag(t.Kind()) | flagIndir}
 }
 
 //gopherjs:replace
 func TypeOf(i any) Type {
 	if i == nil {
 		return nil
 	}
-	return reflectType(js.InternalObject(i).Get("constructor"))
+	return toRType(abi.ReflectType(js.InternalObject(i).Get("constructor")))
 }
 
 //gopherjs:replace
 func ValueOf(i any) Value {
 	if i == nil {
 		return Value{}
 	}
-	return makeValue(reflectType(js.InternalObject(i).Get("constructor")), js.InternalObject(i).Get("$val"), 0)
+	return makeValue(abi.ReflectType(js.InternalObject(i).Get("constructor")), js.InternalObject(i).Get("$val"), 0)
 }
 
 //gopherjs:replace
@@ -140,7 +124,7 @@ func methodReceiver(op string, v Value, i int) (fn unsafe.Pointer) {
 		prop = js.Global.Call("$methodSet", jsType(v.typ)).Index(i).Get("prop").String()
 	}
 	rcvr := v.object()
-	if isWrapped(v.typ) {
+	if v.typ.IsWrapped() {
 		rcvr = jsType(v.typ).New(rcvr)
 	}
 	fn = unsafe.Pointer(rcvr.Get(prop).Unsafe())
@@ -157,10 +141,10 @@ func valueInterface(v Value) any {
 		v = makeMethodValue("Interface", v)
 	}
 
-	if isWrapped(v.typ) {
+	if v.typ.IsWrapped() {
 		if v.flag&flagIndir != 0 && v.Kind() == abi.Struct {
 			cv := jsType(v.typ).Call("zero")
-			copyStruct(cv, v.object(), v.typ)
+			abi.CopyStruct(cv, v.object(), v.typ)
 			return any(unsafe.Pointer(jsType(v.typ).New(cv).Unsafe()))
 		}
 		return any(unsafe.Pointer(jsType(v.typ).New(v.object()).Unsafe()))
@@ -173,10 +157,12 @@ func ifaceE2I(t *abi.Type, src any, dst unsafe.Pointer) {
 	abi.IfaceE2I(t, src, dst)
 }
 
+// TODO(grantnelson-wf): methodName returns the name of the calling method,
+// assumed to be two stack frames above. Determine if we can get this value now
+// and if methodName is needed
+//
 //gopherjs:replace
 func methodName() string {
-	// TODO(grantnelson-wf): methodName returns the name of the calling method,
-	// assumed to be two stack frames above.
 	return "?FIXME?"
 }
 
@@ -188,7 +174,7 @@ func makeMethodValue(op string, v Value) Value {
 
 	fn := methodReceiver(op, v, int(v.flag)>>flagMethodShift)
 	rcvr := v.object()
-	if isWrapped(v.typ) {
+	if v.typ.IsWrapped() {
 		rcvr = jsType(v.typ).New(rcvr)
 	}
 	fv := js.MakeFunc(func(this *js.Object, arguments []*js.Object) any {

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

@@ -77,7 +77,7 @@ func (v Value) assignTo(context string, dst *abi.Type, target unsafe.Pointer) Va
 func (v Value) IsNil() bool {
 	switch k := v.kind(); k {
 	case abi.Pointer, abi.Slice:
-		return v.object() == v.typ.JsType().Get("nil")
+		return v.object() == jsType(v.typ).Get("nil")
 	case abi.Chan:
 		return v.object() == js.Global.Get("$chanNil")
 	case abi.Func:
@@ -112,16 +112,16 @@ func (v Value) Len() int {
 //gopherjs:replace
 func (v Value) Set(x Value) {
 	v.mustBeAssignable()
-	x.mustBeExported()
+	x.mustBeExported() // TODO(grantnelson-wf): This uses the unimplemented `methodName()`. When methodName is fixed we can use Set to test.
 	x = x.assignTo("reflect.Set", v.typ, nil)
 	if v.flag&flagIndir != 0 {
 		switch v.typ.Kind() {
 		case abi.Array:
-			v.typ.JsType().Call("copy", js.InternalObject(v.ptr), js.InternalObject(x.ptr))
+			jsType(v.typ).Call("copy", js.InternalObject(v.ptr), js.InternalObject(x.ptr))
 		case abi.Interface:
 			js.InternalObject(v.ptr).Call("$set", js.InternalObject(valueInterface(x)))
 		case abi.Struct:
-			copyStruct(js.InternalObject(v.ptr), js.InternalObject(x.ptr), v.typ)
+			abi.CopyStruct(js.InternalObject(v.ptr), js.InternalObject(x.ptr), v.typ)
 		default:
 			js.InternalObject(v.ptr).Call("$set", x.object())
 		}
@@ -138,7 +138,7 @@ func (v Value) Elem() Value {
 		if val == js.Global.Get("$ifaceNil") {
 			return Value{}
 		}
-		typ := reflectType(val.Get("constructor"))
+		typ := abi.ReflectType(val.Get("constructor"))
 		return makeValue(typ, val.Get("$val"), v.flag.ro())
 
 	case abi.Pointer:
@@ -149,18 +149,14 @@ func (v Value) Elem() Value {
 		tt := v.typ.PtrType()
 		fl := v.flag&flagRO | flagIndir | flagAddr
 		fl |= flag(tt.Elem.Kind())
-		return Value{
-			typ:  tt.Elem,
-			ptr:  unsafe.Pointer(abi.WrapJsObject(tt.Elem, val).Unsafe()),
-			flag: fl,
-		}
+		return Value{tt.Elem, unsafe.Pointer(abi.WrapJsObject(tt.Elem, val).Unsafe()), fl}
 
 	default:
 		panic(&ValueError{"reflect.Value.Elem", k})
 	}
 }
 
-//gopherjs:new This is added for export_test but is otherwise unused.
+// TODO(grantnelson-wf): Move this to export_test since it is defined there in the original code and only used for tests.
 func (v Value) Field(i int) Value {
 	tt := v.typ.StructType()
 	if tt == nil {
@@ -209,5 +205,5 @@ func (v Value) Field(i int) Value {
 			js.InternalObject(func(x *js.Object) { s.Set(prop, abi.UnwrapJsObject(typ, x)) }),
 		).Unsafe()), fl}
 	}
-	return makeValue(toRType(typ), abi.WrapJsObject(typ, s.Get(prop)), fl)
+	return makeValue(typ, abi.WrapJsObject(typ, s.Get(prop)), fl)
 }