changeset 13397:a7148b46058c mvt

8185573: [MVT] Remove references to vgetfield from compiler code Reviewed-by: psandoz
author thartmann
date Wed, 02 Aug 2017 09:54:10 +0200
parents 8ee978d1135c
children 297678e133e6
files src/share/vm/ci/bcEscapeAnalyzer.cpp src/share/vm/ci/ciField.cpp src/share/vm/ci/ciStreams.cpp src/share/vm/ci/ciTypeFlow.cpp src/share/vm/compiler/methodLiveness.cpp src/share/vm/opto/graphKit.cpp
diffstat 6 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/ci/bcEscapeAnalyzer.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/ci/bcEscapeAnalyzer.cpp	Wed Aug 02 09:54:10 2017 +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();
--- a/src/share/vm/ci/ciField.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/ci/ciField.cpp	Wed Aug 02 09:54:10 2017 +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
--- a/src/share/vm/ci/ciStreams.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/ci/ciStreams.cpp	Wed Aug 02 09:54:10 2017 +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 ||
--- a/src/share/vm/ci/ciTypeFlow.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/ci/ciTypeFlow.cpp	Wed Aug 02 09:54:10 2017 +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;
 
--- a/src/share/vm/compiler/methodLiveness.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/compiler/methodLiveness.cpp	Wed Aug 02 09:54:10 2017 +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:
--- a/src/share/vm/opto/graphKit.cpp	Mon Jul 31 14:08:19 2017 +0200
+++ b/src/share/vm/opto/graphKit.cpp	Wed Aug 02 09:54:10 2017 +0200
@@ -899,7 +899,6 @@
   case Bytecodes::_getstatic:
   case Bytecodes::_putstatic:
   case Bytecodes::_getfield:
-  case Bytecodes::_vgetfield:
   case Bytecodes::_putfield:
     {
       bool ignored_will_link;