commit c5fd90c6d4f5446aceca5cc397ace01b217a4113
author Goktug Gokdogan <goktug@google.com> Tue Nov 05 16:14:01 2019 -0800
committer Goktug Gokdogan <goktug@google.com> Wed Nov 06 00:16:56 2019 +0000
tree 5b9bc1e9cdbf751c4c85e53d9795a247f31c1b39
parent 19538fbaa186131940962193ed841d398f9a3c42

Improve array checking for Serializable/Clonable.

Check if something is array over class instance is costly and
direct check is simple to implement.

Change-Id: Iaeb32125ded3cde99a6f53bc40cc65d3ce41b838

user/super/com/google/gwt/emul/java/io/Serializable.java

diff --git a/user/super/com/google/gwt/emul/java/io/Serializable.java b/user/super/com/google/gwt/emul/java/io/Serializable.java
index 3032baf..9458df5 100644
--- a/user/super/com/google/gwt/emul/java/io/Serializable.java
+++ b/user/super/com/google/gwt/emul/java/io/Serializable.java
@@ -16,6 +16,7 @@
 package java.io;
 
 import javaemul.internal.JsUtils;
+import javaemul.internal.NativeArray;
 import jsinterop.annotations.JsMethod;
 
 /**
@@ -37,7 +38,7 @@
         || type.equals("string")
         || instance.getTypeMarker()
         // Arrays are implicitly instances of Serializable (JLS 10.7).
-        || instance.getClass().isArray();
+        || NativeArray.isArray(instance);
   }
   // CHECKSTYLE_ON: end utility methods
 }

user/super/com/google/gwt/emul/java/lang/Cloneable.java

diff --git a/user/super/com/google/gwt/emul/java/lang/Cloneable.java b/user/super/com/google/gwt/emul/java/lang/Cloneable.java
index 74535b4..907f569 100644
--- a/user/super/com/google/gwt/emul/java/lang/Cloneable.java
+++ b/user/super/com/google/gwt/emul/java/lang/Cloneable.java
@@ -15,6 +15,7 @@
  */
 package java.lang;
 
+import javaemul.internal.NativeArray;
 import jsinterop.annotations.JsMethod;
 
 /**
@@ -31,7 +32,7 @@
 
     return instance.getTypeMarker()
         // Arrays are implicitly instances of Cloneable (JLS 10.7).
-        || instance.getClass().isArray();
+        || NativeArray.isArray(instance);
   }
   // CHECKSTYLE_ON: end utility methods
 }

user/super/com/google/gwt/emul/javaemul/internal/NativeArray.java

diff --git a/user/super/com/google/gwt/emul/javaemul/internal/NativeArray.java b/user/super/com/google/gwt/emul/javaemul/internal/NativeArray.java
index 7f0ea99..792ab3c 100644
--- a/user/super/com/google/gwt/emul/javaemul/internal/NativeArray.java
+++ b/user/super/com/google/gwt/emul/javaemul/internal/NativeArray.java
@@ -39,4 +39,6 @@
   public native Object[] slice(int fromIndex, int toIndex);
   public native void splice(int index, int deleteCount, @DoNotAutobox Object... value);
   public native <T> void sort(CompareFunction compareFunction);
+
+  public static native boolean isArray(Object o);
 }