Mercurial > hg > graal-jvmci-8

changeset 23662:608155a023de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed upstream merge errors
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 11:47:05 +0200
parents e6f662594d5f
children 6e1d37ce0d0c
files src/share/vm/runtime/deoptimization.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: