commit 2239fc1b8955313cb880a53a73447daeb89e6f11
author Ian Rogers <irogers@google.com> Wed Aug 21 22:06:43 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 28 09:54:14 2013 -0700
tree 8fe4a44849e02ef0996e9881d9d7d0a1d5604298
parent 482b89bdd3e2069852061909f35823ab7dba844f

Fix arrayIndexScale.

Bug 10430382.

(cherry picked from commit 9da79116014d4396d33a9a1ada891c49aed7c6a3)

Change-Id: Ife41904b1580dae74ae17d49c799a1a81d4a18bc

libart/src/main/java/sun/misc/Unsafe.java

diff --git a/libart/src/main/java/sun/misc/Unsafe.java b/libart/src/main/java/sun/misc/Unsafe.java
index aa7b6de..0a4d8b2 100644
--- a/libart/src/main/java/sun/misc/Unsafe.java
+++ b/libart/src/main/java/sun/misc/Unsafe.java
@@ -101,7 +101,7 @@
           throw new IllegalArgumentException("Valid for array classes only: " + clazz);
       }
       // TODO: make the following not specific to the object model.
-      if (!clazz.isPrimitive()) {
+      if (!component.isPrimitive()) {
           return 4;
       } else  if (component == long.class || component == double.class) {
           return 8;