Revert "Getting DeepEqual to work with maps whose key is an interface (#4360)"

This reverts commit 1fd75ffbda.

The change is not correct and allows code to continue while it should
panic. For details, see:
https://github.com/tinygo-org/tinygo/pull/4360#issuecomment-2252943012
This commit is contained in:
Ayke van Laethem
2024-07-26 16:56:42 +02:00
committed by Ayke
parent 1fd75ffbda
commit 6184a6cd35
2 changed files with 1 additions and 19 deletions
-16
View File
@@ -1102,20 +1102,6 @@ func init() {
cycleMap3["different"] = cycleMap3
}
type deepEqualInterface interface {
Foo()
}
type deepEqualConcrete struct {
int
}
func (deepEqualConcrete) Foo() {}
var (
deepEqualConcrete1 = deepEqualConcrete{1}
deepEqualConcrete2 = deepEqualConcrete{2}
)
var deepEqualTests = []DeepEqualTest{
// Equalities
{nil, nil, true},
@@ -1133,7 +1119,6 @@ var deepEqualTests = []DeepEqualTest{
{[]byte{1, 2, 3}, []byte{1, 2, 3}, true},
{[]MyByte{1, 2, 3}, []MyByte{1, 2, 3}, true},
{MyBytes{1, 2, 3}, MyBytes{1, 2, 3}, true},
{map[deepEqualInterface]string{deepEqualConcrete1: "a"}, map[deepEqualInterface]string{deepEqualConcrete1: "a"}, true},
// Inequalities
{1, 2, false},
@@ -1155,7 +1140,6 @@ var deepEqualTests = []DeepEqualTest{
{fn3, fn3, false},
{[][]int{{1}}, [][]int{{2}}, false},
{&structWithSelfPtr{p: &structWithSelfPtr{s: "a"}}, &structWithSelfPtr{p: &structWithSelfPtr{s: "b"}}, false},
{map[deepEqualInterface]string{deepEqualConcrete1: "a"}, map[deepEqualInterface]string{deepEqualConcrete2: "a"}, false},
// Fun with floating point.
{math.NaN(), math.NaN(), false},
+1 -3
View File
@@ -982,9 +982,7 @@ func (v Value) MapIndex(key Value) Value {
vkey := v.typecode.key()
// compare key type with actual key type of map
// AssignableTo is not implemented for interfaces
// avoid: "reflect: unimplemented: AssignableTo with interface"
if vkey.Kind() != Interface && !key.typecode.AssignableTo(vkey) {
if !key.typecode.AssignableTo(vkey) {
// type error?
panic("reflect.Value.MapIndex: incompatible types for key")
}