summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-08-21 22:06:43 -0700
committerBrian Carlstrom <bdc@google.com>2013-08-28 09:54:14 -0700
commit2239fc1b8955313cb880a53a73447daeb89e6f11 (patch)
tree8fe4a44849e02ef0996e9881d9d7d0a1d5604298
parent482b89bdd3e2069852061909f35823ab7dba844f (diff)
downloadlibcore-2239fc1b8955313cb880a53a73447daeb89e6f11.zip
libcore-2239fc1b8955313cb880a53a73447daeb89e6f11.tar.gz
libcore-2239fc1b8955313cb880a53a73447daeb89e6f11.tar.bz2
Fix arrayIndexScale.
Bug 10430382. (cherry picked from commit 9da79116014d4396d33a9a1ada891c49aed7c6a3) Change-Id: Ife41904b1580dae74ae17d49c799a1a81d4a18bc
-rw-r--r--libart/src/main/java/sun/misc/Unsafe.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public final class Unsafe {
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;