Type the reference member of JValue as an Object pointer.
Previously this had been a void pointer. To avoid adding lots of
casts from the logical Object subtypes to Object the RETURN_PTR macro
silently casts its argument to an Object* before performing an
assignment to the JValue return value. After an inheritance
relationship is established between Object and its subtypes this cast
can be removed.
Change-Id: Id05e5c11e57e2a9afd12bad0be095f1dfe9e1f51
diff --git a/vm/mterp/out/InterpC-x86.cpp b/vm/mterp/out/InterpC-x86.cpp
index 7f89d62..5f31de6 100644
--- a/vm/mterp/out/InterpC-x86.cpp
+++ b/vm/mterp/out/InterpC-x86.cpp
@@ -1542,7 +1542,7 @@
dvmWriteBarrierArray(newArray, 0, newArray->length);
}
- retval.l = newArray;
+ retval.l = (Object*)newArray;
}
if (jumboFormat) {
FINISH(5);