# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1464774425 -7200
# Node ID 608155a023def0a7559fd615cdab67c7dfe178ae
# Parent  e6f662594d5f5d54347d940f1c811054b0c32a5c
fixed upstream merge errors

diff -r e6f662594d5f -r 608155a023de src/share/vm/runtime/deoptimization.cpp
--- a/src/share/vm/runtime/deoptimization.cpp	Wed Jun 01 00:12:11 2016 +0200
+++ b/src/share/vm/runtime/deoptimization.cpp	Wed Jun 01 11:47:05 2016 +0200
@@ -914,13 +914,13 @@
     case T_CHAR:
       assert(value->type() == T_INT, "Agreement.");
       val = value->get_int();
-      obj->char_field_put(index, (jchar)*((jint*)&val));
+      obj->char_at_put(index, (jchar)*((jint*)&val));
       break;
 
     case T_BYTE:
       assert(value->type() == T_INT, "Agreement.");
       val = value->get_int();
-      obj->byte_field_put(index, (jbyte)*((jint*)&val));
+      obj->byte_at_put(index, (jbyte)*((jint*)&val));
       break;
 
     case T_BOOLEAN: