Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/interpreter/rewriter.cpp	Wed Apr 06 17:32:09 2011 -0700
     1.2 +++ b/src/share/vm/interpreter/rewriter.cpp	Thu Apr 07 17:02:30 2011 -0700
     1.3 @@ -52,7 +52,6 @@
     1.4        case JVM_CONSTANT_MethodHandle      : // fall through
     1.5        case JVM_CONSTANT_MethodType        : // fall through
     1.6        case JVM_CONSTANT_InvokeDynamic     : // fall through
     1.7 -      case JVM_CONSTANT_InvokeDynamicTrans: // fall through
     1.8          add_cp_cache_entry(i);
     1.9          break;
    1.10      }
    1.11 @@ -62,7 +61,6 @@
    1.12              "all cp cache indexes fit in a u2");
    1.13  
    1.14    _have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0);
    1.15 -  _have_invoke_dynamic |= ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamicTrans)) != 0);
    1.16  }
    1.17  
    1.18  
    1.19 @@ -81,16 +79,10 @@
    1.20        if (pool_index >= 0 &&
    1.21            _pool->tag_at(pool_index).is_invoke_dynamic()) {
    1.22          int bsm_index = _pool->invoke_dynamic_bootstrap_method_ref_index_at(pool_index);
    1.23 -        if (bsm_index != 0) {
    1.24 -          assert(_pool->tag_at(bsm_index).is_method_handle(), "must be a MH constant");
    1.25 -          // There is a CP cache entry holding the BSM for these calls.
    1.26 -          int bsm_cache_index = cp_entry_to_cp_cache(bsm_index);
    1.27 -          cache->entry_at(i)->initialize_bootstrap_method_index_in_cache(bsm_cache_index);
    1.28 -        } else {
    1.29 -          // There is no CP cache entry holding the BSM for these calls.
    1.30 -          // We will need to look for a class-global BSM, later.
    1.31 -          guarantee(AllowTransitionalJSR292, "");
    1.32 -        }
    1.33 +        assert(_pool->tag_at(bsm_index).is_method_handle(), "must be a MH constant");
    1.34 +        // There is a CP cache entry holding the BSM for these calls.
    1.35 +        int bsm_cache_index = cp_entry_to_cp_cache(bsm_index);
    1.36 +        cache->entry_at(i)->initialize_bootstrap_method_index_in_cache(bsm_cache_index);
    1.37        }
    1.38      }
    1.39    }