*** old/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed Mar 30 07:00:03 2011
--- new/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed Mar 30 07:00:03 2011

*** 741,756 ****
--- 741,756 ----
                                                         int bcp_offset, size_t index_size) {
    assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
    if (index_size == sizeof(u2)) {
      get_2_byte_integer_at_bcp(bcp_offset, cache, tmp, Unsigned);
    } else if (index_size == sizeof(u4)) {
!     assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic");
!     assert(EnableInvokeDynamic, "giant index used only for JSR 292");
      get_4_byte_integer_at_bcp(bcp_offset, cache, tmp);
      assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line");
      xor3(tmp, -1, tmp);  // convert to plain index
    } else if (index_size == sizeof(u1)) {
!     assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles");
!     assert(EnableInvokeDynamic, "tiny index used only for JSR 292");
      ldub(Lbcp, bcp_offset, tmp);
    } else {
      ShouldNotReachHere();
    }
  }