--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Nov 10 21:36:35 2015 -0800
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Nov 11 01:27:36 2015 +0300
@@ -497,12 +497,15 @@
// 1: getfield
// 2: index
// 3: index
- // 4: ireturn/areturn
+ // 4: ireturn/areturn/freturn/lreturn/dreturn
// NB this is not raw bytecode: index is in machine order
u1 *code = method->code_base();
assert(code[0] == Bytecodes::_aload_0 &&
code[1] == Bytecodes::_getfield &&
(code[4] == Bytecodes::_ireturn ||
+ code[4] == Bytecodes::_freturn ||
+ code[4] == Bytecodes::_lreturn ||
+ code[4] == Bytecodes::_dreturn ||
code[4] == Bytecodes::_areturn), "should do");
u2 index = Bytes::get_native_u2(&code[2]);