Revert "WIP: Hacky fix for wrong method set order with unicode."

dmitshur · dmitshur · commit 88dc1afc3404 · 2018-02-25T17:52:24.000-05:00
This reverts commit c4db7b2. That commit was a temporary hacky fix to help find out where the issue was. It's not a general fix. Revert it, and file issue gopherjs#763 to resolve this issue fully and correctly.
diff --git a/compiler/natives/src/reflect/reflect_test.go b/compiler/natives/src/reflect/reflect_test.go
@@ -157,6 +157,24 @@ var deepEqualTests = []DeepEqualTest{
 	//{&loopy1, &loopy2, true}, // TODO: Fix.
 }
 
+// TODO: Fix this. See https://github.com/gopherjs/gopherjs/issues/763.
+func TestIssue22073(t *testing.T) {
+	m := reflect.ValueOf(NonExportedFirst(0)).Method(0)
+
+	if got := m.Type().NumOut(); got != 0 {
+		t.Errorf("NumOut: got %v, want 0", got)
+	}
+
+	// TODO: Fix this. The call below fails with:
+	//
+	// 	var $call = function(fn, rcvr, args) { return fn.apply(rcvr, args); };
+	// 	                                                 ^
+	// 	TypeError: Cannot read property 'apply' of undefined
+
+	// Shouldn't panic.
+	//m.Call(nil)
+}
+
 func TestCallReturnsEmpty(t *testing.T) {
 	t.Skip("test uses runtime.SetFinalizer, which is not supported by GopherJS")
 }
diff --git a/compiler/prelude/types.go b/compiler/prelude/types.go
@@ -453,13 +453,7 @@ var $methodSet = function(typ) {
   }
 
   typ.methodSetCache = [];
-  var x = Object.keys(base).sort();
-  if (x.length === 2 && x[0] === "nonexported" && x[1] === "\xCE\xA6Exported") {
-    /* HACK: Hacky fix for TestIssue22073. Need to find a good general fix. */
-    x[0] = "\xCE\xA6Exported";
-    x[1] = "nonexported";
-  }
-  x.forEach(function(name) {
+  Object.keys(base).sort().forEach(function(name) {
     typ.methodSetCache.push(base[name]);
   });
   return typ.methodSetCache;
