--- old/src/share/vm/interpreter/bytecodes.cpp	2017-07-27 20:01:41.677985785 +0200
+++ new/src/share/vm/interpreter/bytecodes.cpp	2017-07-27 20:01:41.589985789 +0200
@@ -486,7 +486,6 @@
   def(_vaload              , "vaload"              , "b"    , NULL    , T_VALUETYPE, -1, true);
   def(_vastore             , "vastore"             , "b"    , NULL    , T_VOID   , -3, true );
   def(_vreturn             , "vreturn"             , "b"    , NULL    , T_VALUETYPE, -1, true);
-  def(_vgetfield           , "vgetfield"           , "bJJ"  , NULL    , T_ILLEGAL,  0, true );
   def(_vbox                , "vbox"                , "bkk"  , NULL    , T_OBJECT ,  0, true );
   def(_vunbox              , "vunbox"              , "bkk"  , NULL    , T_VALUETYPE,0, true );
   def(_vdefault            , "vdefault"            , "bkk"  , NULL    , T_VALUETYPE, 1, true);
@@ -543,6 +542,7 @@
 
   def(_nofast_aload_0      , "nofast_aload_0"      , "b"    , NULL    , T_ILLEGAL,  1, true , _aload_0        );
   def(_nofast_iload        , "nofast_iload"        , "bi"   , NULL    , T_ILLEGAL,  1, false, _iload          );
+  def(_vgetfield           , "vgetfield"           , "bJJ"  , NULL    , T_ILLEGAL,  0, true , _getfield       );
 
   def(_shouldnotreachhere  , "_shouldnotreachhere" , "b"    , NULL    , T_VOID   ,  0, false);
 
--- old/src/share/vm/interpreter/bytecodes.hpp	2017-07-27 20:01:42.009985772 +0200
+++ new/src/share/vm/interpreter/bytecodes.hpp	2017-07-27 20:01:41.917985776 +0200
@@ -248,11 +248,11 @@
     _vstore               = 204, // 0xcc
     _vaload               = 205, // 0xcd
     _vastore              = 206, // 0xce
-    _vreturn              = 210, // 0xd2
-    _vdefault             = 214, // 0xd6
-    _vwithfield           = 215, // 0xd7
-    _vbox                 = 216, // 0xd6
-    _vunbox               = 217, // 0xd7
+    _vreturn              = 207, // 0xcf
+    _vdefault             = 208, // 0xd0
+    _vwithfield           = 209, // 0xd1
+    _vbox                 = 210, // 0xd2
+    _vunbox               = 211, // 0xd3
 
     number_of_java_codes,
 
--- old/src/share/vm/interpreter/templateTable.cpp	2017-07-27 20:01:42.317985760 +0200
+++ new/src/share/vm/interpreter/templateTable.cpp	2017-07-27 20:01:42.229985763 +0200
@@ -466,7 +466,6 @@
   def(Bytecodes::_vaload              , ____|____|clvm|____, itos, qtos, vaload              ,  _           );
   def(Bytecodes::_vastore             , ____|____|clvm|____, vtos, vtos, vastore             ,  _           );
   def(Bytecodes::_vreturn             , ____|disp|clvm|____, qtos, qtos, _return             , qtos         );
-  def(Bytecodes::_vgetfield           , ubcp|____|clvm|____, vtos, vtos, vgetfield           , _            );
   def(Bytecodes::_vdefault            , ubcp|____|clvm|____, vtos, qtos, vdefault            , _            );
   def(Bytecodes::_vwithfield          , ubcp|____|clvm|____, vtos, qtos, vwithfield          , _            );
   def(Bytecodes::_vbox                , ubcp|____|clvm|____, qtos, atos, _vbox               , _            );
@@ -538,6 +537,8 @@
   def(Bytecodes::_nofast_aload_0      , ____|____|clvm|____, vtos, atos, nofast_aload_0      ,  _           );
   def(Bytecodes::_nofast_iload        , ubcp|____|clvm|____, vtos, itos, nofast_iload        ,  _           );
 
+  def(Bytecodes::_vgetfield           , ubcp|____|clvm|____, vtos, vtos, vgetfield           , _            );
+
   def(Bytecodes::_shouldnotreachhere   , ____|____|____|____, vtos, vtos, shouldnotreachhere ,  _           );
   // platform specific bytecodes
   pd_initialize();