--- old/src/share/vm/ci/bcEscapeAnalyzer.cpp	2017-07-31 14:34:13.610754658 +0200
+++ new/src/share/vm/ci/bcEscapeAnalyzer.cpp	2017-07-31 14:34:13.474754660 +0200
@@ -866,7 +866,6 @@
         break;
       case Bytecodes::_getstatic:
       case Bytecodes::_getfield:
-      case Bytecodes::_vgetfield:
         { bool ignored_will_link;
           ciField* field = s.get_field(ignored_will_link);
           BasicType field_type = field->type()->basic_type();
--- old/src/share/vm/ci/ciField.cpp	2017-07-31 14:34:14.054754652 +0200
+++ new/src/share/vm/ci/ciField.cpp	2017-07-31 14:34:13.930754653 +0200
@@ -368,8 +368,7 @@
   VM_ENTRY_MARK;
   assert(bc == Bytecodes::_getstatic || bc == Bytecodes::_putstatic ||
          bc == Bytecodes::_getfield  || bc == Bytecodes::_putfield  ||
-         bc == Bytecodes::_vgetfield || bc == Bytecodes::_vwithfield,
-         "unexpected bytecode");
+         bc == Bytecodes::_vwithfield, "unexpected bytecode");
 
   if (_offset == -1) {
     // at creation we couldn't link to our holder so we need to
--- old/src/share/vm/ci/ciStreams.cpp	2017-07-31 14:34:14.414754647 +0200
+++ new/src/share/vm/ci/ciStreams.cpp	2017-07-31 14:34:14.290754648 +0200
@@ -267,7 +267,6 @@
 // index of the referenced field.
 int ciBytecodeStream::get_field_index() {
   assert(cur_bc() == Bytecodes::_getfield ||
-         cur_bc() == Bytecodes::_vgetfield ||
          cur_bc() == Bytecodes::_putfield ||
          cur_bc() == Bytecodes::_getstatic ||
          cur_bc() == Bytecodes::_putstatic ||
--- old/src/share/vm/ci/ciTypeFlow.cpp	2017-07-31 14:34:14.766754642 +0200
+++ new/src/share/vm/ci/ciTypeFlow.cpp	2017-07-31 14:34:14.642754644 +0200
@@ -1270,7 +1270,6 @@
   case Bytecodes::_fstore_2:  store_local_float(2);                  break;
   case Bytecodes::_fstore_3:  store_local_float(3);                  break;
 
-  case Bytecodes::_vgetfield:
   case Bytecodes::_getfield:  do_getfield(str);                      break;
   case Bytecodes::_getstatic: do_getstatic(str);                     break;
 
--- old/src/share/vm/compiler/methodLiveness.cpp	2017-07-31 14:34:15.110754637 +0200
+++ new/src/share/vm/compiler/methodLiveness.cpp	2017-07-31 14:34:14.994754639 +0200
@@ -771,7 +771,6 @@
     case Bytecodes::_getstatic:
     case Bytecodes::_putstatic:
     case Bytecodes::_getfield:
-    case Bytecodes::_vgetfield:
     case Bytecodes::_putfield:
     case Bytecodes::_invokevirtual:
     case Bytecodes::_invokespecial:
--- old/src/share/vm/opto/graphKit.cpp	2017-07-31 14:34:15.478754632 +0200
+++ new/src/share/vm/opto/graphKit.cpp	2017-07-31 14:34:15.350754634 +0200
@@ -899,7 +899,6 @@
   case Bytecodes::_getstatic:
   case Bytecodes::_putstatic:
   case Bytecodes::_getfield:
-  case Bytecodes::_vgetfield:
   case Bytecodes::_putfield:
     {
       bool ignored_will_link;