Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Wed Dec 23 03:12:16 2009 -0800
     1.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Wed Jan 06 22:21:39 2010 -0800
     1.3 @@ -63,12 +63,12 @@
     1.4      javaSystemLoaderField = type.getOopField("_java_system_loader");
     1.5      nofBuckets = db.lookupIntConstant("SystemDictionary::_nof_buckets").intValue();
     1.6  
     1.7 -    objectKlassField = type.getOopField(WK_KLASS("object_klass"));
     1.8 -    classLoaderKlassField = type.getOopField(WK_KLASS("classloader_klass"));
     1.9 -    stringKlassField = type.getOopField(WK_KLASS("string_klass"));
    1.10 -    systemKlassField = type.getOopField(WK_KLASS("system_klass"));
    1.11 -    threadKlassField = type.getOopField(WK_KLASS("thread_klass"));
    1.12 -    threadGroupKlassField = type.getOopField(WK_KLASS("threadGroup_klass"));
    1.13 +    objectKlassField = type.getOopField(WK_KLASS("Object_klass"));
    1.14 +    classLoaderKlassField = type.getOopField(WK_KLASS("ClassLoader_klass"));
    1.15 +    stringKlassField = type.getOopField(WK_KLASS("String_klass"));
    1.16 +    systemKlassField = type.getOopField(WK_KLASS("System_klass"));
    1.17 +    threadKlassField = type.getOopField(WK_KLASS("Thread_klass"));
    1.18 +    threadGroupKlassField = type.getOopField(WK_KLASS("ThreadGroup_klass"));
    1.19    }
    1.20  
    1.21    // This WK functions must follow the definitions in systemDictionary.hpp:

     2.1 --- a/src/cpu/sparc/vm/sparc.ad	Wed Dec 23 03:12:16 2009 -0800
     2.2 +++ b/src/cpu/sparc/vm/sparc.ad	Wed Jan 06 22:21:39 2010 -0800
     2.3 @@ -1885,6 +1885,10 @@
     2.4    return RegMask();
     2.5  }
     2.6  
     2.7 +const RegMask Matcher::method_handle_invoke_SP_save_mask() {
     2.8 +  return RegMask();
     2.9 +}
    2.10 +
    2.11  %}
    2.12  
    2.13  

     3.1 --- a/src/cpu/x86/vm/frame_x86.cpp	Wed Dec 23 03:12:16 2009 -0800
     3.2 +++ b/src/cpu/x86/vm/frame_x86.cpp	Wed Jan 06 22:21:39 2010 -0800
     3.3 @@ -330,6 +330,14 @@
     3.4    // This is the sp before any possible extension (adapter/locals).
     3.5    intptr_t* unextended_sp = interpreter_frame_sender_sp();
     3.6  
     3.7 +  address sender_pc = this->sender_pc();
     3.8 +  CodeBlob* sender_cb = CodeCache::find_blob_unsafe(sender_pc);
     3.9 +  assert(sender_cb, "sanity");
    3.10 +  nmethod* sender_nm = sender_cb->as_nmethod_or_null();
    3.11 +  if (sender_nm != NULL && sender_nm->is_method_handle_return(sender_pc)) {
    3.12 +    unextended_sp = (intptr_t*) at(link_offset);
    3.13 +  }
    3.14 +
    3.15    // The interpreter and compiler(s) always save EBP/RBP in a known
    3.16    // location on entry. We must record where that location is
    3.17    // so this if EBP/RBP was live on callout from c2 we can find
    3.18 @@ -352,7 +360,7 @@
    3.19  #endif // AMD64
    3.20    }
    3.21  #endif /* COMPILER2 */
    3.22 -  return frame(sp, unextended_sp, link(), sender_pc());
    3.23 +  return frame(sp, unextended_sp, link(), sender_pc);
    3.24  }
    3.25  
    3.26  
    3.27 @@ -375,6 +383,18 @@
    3.28  
    3.29    intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset);
    3.30  
    3.31 +  intptr_t* unextended_sp = sender_sp;
    3.32 +  // If we are returning to a compiled method handle call site,
    3.33 +  // the saved_fp will in fact be a saved value of the unextended SP.
    3.34 +  // The simplest way to tell whether we are returning to such a call
    3.35 +  // site is as follows:
    3.36 +  CodeBlob* sender_cb = CodeCache::find_blob_unsafe(sender_pc);
    3.37 +  assert(sender_cb, "sanity");
    3.38 +  nmethod* sender_nm = sender_cb->as_nmethod_or_null();
    3.39 +  if (sender_nm != NULL && sender_nm->is_method_handle_return(sender_pc)) {
    3.40 +    unextended_sp = saved_fp;
    3.41 +  }
    3.42 +
    3.43    if (map->update_map()) {
    3.44      // Tell GC to use argument oopmaps for some runtime stubs that need it.
    3.45      // For C1, the runtime stub might not have oop maps, so set this flag
    3.46 @@ -399,7 +419,7 @@
    3.47    }
    3.48  
    3.49    assert(sender_sp != sp(), "must have changed");
    3.50 -  return frame(sender_sp, saved_fp, sender_pc);
    3.51 +  return frame(sender_sp, unextended_sp, saved_fp, sender_pc);
    3.52  }
    3.53  
    3.54  frame frame::sender(RegisterMap* map) const {

     4.1 --- a/src/cpu/x86/vm/frame_x86.inline.hpp	Wed Dec 23 03:12:16 2009 -0800
     4.2 +++ b/src/cpu/x86/vm/frame_x86.inline.hpp	Wed Jan 06 22:21:39 2010 -0800
     4.3 @@ -225,11 +225,12 @@
     4.4  // top of expression stack
     4.5  inline intptr_t* frame::interpreter_frame_tos_address() const {
     4.6    intptr_t* last_sp = interpreter_frame_last_sp();
     4.7 -  if (last_sp == NULL ) {
     4.8 +  if (last_sp == NULL) {
     4.9      return sp();
    4.10    } else {
    4.11 -    // sp() may have been extended by an adapter
    4.12 -    assert(last_sp < fp() && last_sp >= sp(), "bad tos");
    4.13 +    // sp() may have been extended or shrunk by an adapter.  At least
    4.14 +    // check that we don't fall behind the legal region.
    4.15 +    assert(last_sp < (intptr_t*) interpreter_frame_monitor_begin(), "bad tos");
    4.16      return last_sp;
    4.17    }
    4.18  }

     5.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp	Wed Dec 23 03:12:16 2009 -0800
     5.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Wed Jan 06 22:21:39 2010 -0800
     5.3 @@ -65,9 +65,9 @@
     5.4    // Verify that argslot lies within (rsp, rbp].
     5.5    Label L_ok, L_bad;
     5.6    __ cmpptr(rax_argslot, rbp);
     5.7 -  __ jcc(Assembler::above, L_bad);
     5.8 +  __ jccb(Assembler::above, L_bad);
     5.9    __ cmpptr(rsp, rax_argslot);
    5.10 -  __ jcc(Assembler::below, L_ok);
    5.11 +  __ jccb(Assembler::below, L_ok);
    5.12    __ bind(L_bad);
    5.13    __ stop(error_message);
    5.14    __ bind(L_ok);
    5.15 @@ -136,9 +136,9 @@
    5.16    if (arg_slots.is_register()) {
    5.17      Label L_ok, L_bad;
    5.18      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
    5.19 -    __ jcc(Assembler::greater, L_bad);
    5.20 +    __ jccb(Assembler::greater, L_bad);
    5.21      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
    5.22 -    __ jcc(Assembler::zero, L_ok);
    5.23 +    __ jccb(Assembler::zero, L_ok);
    5.24      __ bind(L_bad);
    5.25      __ stop("assert arg_slots <= 0 and clear low bits");
    5.26      __ bind(L_ok);
    5.27 @@ -173,7 +173,7 @@
    5.28      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
    5.29      __ addptr(rdx_temp, wordSize);
    5.30      __ cmpptr(rdx_temp, rax_argslot);
    5.31 -    __ jcc(Assembler::less, loop);
    5.32 +    __ jccb(Assembler::less, loop);
    5.33    }
    5.34  
    5.35    // Now move the argslot down, to point to the opened-up space.
    5.36 @@ -211,9 +211,9 @@
    5.37      Label L_ok, L_bad;
    5.38      __ lea(rbx_temp, Address(rax_argslot, arg_slots, Address::times_ptr));
    5.39      __ cmpptr(rbx_temp, rbp);
    5.40 -    __ jcc(Assembler::above, L_bad);
    5.41 +    __ jccb(Assembler::above, L_bad);
    5.42      __ cmpptr(rsp, rax_argslot);
    5.43 -    __ jcc(Assembler::below, L_ok);
    5.44 +    __ jccb(Assembler::below, L_ok);
    5.45      __ bind(L_bad);
    5.46      __ stop("deleted argument(s) must fall within current frame");
    5.47      __ bind(L_ok);
    5.48 @@ -221,9 +221,9 @@
    5.49    if (arg_slots.is_register()) {
    5.50      Label L_ok, L_bad;
    5.51      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
    5.52 -    __ jcc(Assembler::less, L_bad);
    5.53 +    __ jccb(Assembler::less, L_bad);
    5.54      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
    5.55 -    __ jcc(Assembler::zero, L_ok);
    5.56 +    __ jccb(Assembler::zero, L_ok);
    5.57      __ bind(L_bad);
    5.58      __ stop("assert arg_slots >= 0 and clear low bits");
    5.59      __ bind(L_ok);
    5.60 @@ -258,7 +258,7 @@
    5.61      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
    5.62      __ addptr(rdx_temp, -wordSize);
    5.63      __ cmpptr(rdx_temp, rsp);
    5.64 -    __ jcc(Assembler::greaterEqual, loop);
    5.65 +    __ jccb(Assembler::greaterEqual, loop);
    5.66    }
    5.67  
    5.68    // Now move the argslot up, to point to the just-copied block.
    5.69 @@ -268,8 +268,9 @@
    5.70  }
    5.71  
    5.72  #ifndef PRODUCT
    5.73 +extern "C" void print_method_handle(oop mh);
    5.74  void trace_method_handle_stub(const char* adaptername,
    5.75 -                              oopDesc* mh,
    5.76 +                              oop mh,
    5.77                                intptr_t* entry_sp,
    5.78                                intptr_t* saved_sp,
    5.79                                intptr_t* saved_bp) {
    5.80 @@ -280,6 +281,7 @@
    5.81           adaptername, (intptr_t)mh, (intptr_t)entry_sp, (intptr_t)(saved_sp - entry_sp), (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp);
    5.82    if (last_sp != saved_sp)
    5.83      printf("*** last_sp="INTPTR_FORMAT"\n", (intptr_t)last_sp);
    5.84 +  if (Verbose)  print_method_handle(mh);
    5.85  }
    5.86  #endif //PRODUCT
    5.87  
    5.88 @@ -382,11 +384,11 @@
    5.89        // FIXME: fill in _raise_exception_method with a suitable sun.dyn method
    5.90        __ movptr(rbx_method, ExternalAddress((address) &_raise_exception_method));
    5.91        __ testptr(rbx_method, rbx_method);
    5.92 -      __ jcc(Assembler::zero, no_method);
    5.93 +      __ jccb(Assembler::zero, no_method);
    5.94        int jobject_oop_offset = 0;
    5.95        __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
    5.96        __ testptr(rbx_method, rbx_method);
    5.97 -      __ jcc(Assembler::zero, no_method);
    5.98 +      __ jccb(Assembler::zero, no_method);
    5.99        __ verify_oop(rbx_method);
   5.100        __ push(rdi_pc);          // and restore caller PC
   5.101        __ jmp(rbx_method_fie);
   5.102 @@ -533,16 +535,15 @@
   5.103        if (arg_type == T_OBJECT) {
   5.104          __ movptr(Address(rax_argslot, 0), rbx_temp);
   5.105        } else {
   5.106 -        __ load_sized_value(rbx_temp, prim_value_addr,
   5.107 +        __ load_sized_value(rdx_temp, prim_value_addr,
   5.108                              type2aelembytes(arg_type), is_signed_subword_type(arg_type));
   5.109 -        __ movptr(Address(rax_argslot, 0), rbx_temp);
   5.110 +        __ movptr(Address(rax_argslot, 0), rdx_temp);
   5.111  #ifndef _LP64
   5.112          if (arg_slots == 2) {
   5.113 -          __ movl(rbx_temp, prim_value_addr.plus_disp(wordSize));
   5.114 -          __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rbx_temp);
   5.115 +          __ movl(rdx_temp, prim_value_addr.plus_disp(wordSize));
   5.116 +          __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rdx_temp);
   5.117          }
   5.118  #endif //_LP64
   5.119 -        break;
   5.120        }
   5.121  
   5.122        if (direct_to_method) {
   5.123 @@ -584,7 +585,7 @@
   5.124        Label done;
   5.125        __ movptr(rdx_temp, vmarg);
   5.126        __ testl(rdx_temp, rdx_temp);
   5.127 -      __ jcc(Assembler::zero, done);          // no cast if null
   5.128 +      __ jccb(Assembler::zero, done);         // no cast if null
   5.129        __ load_klass(rdx_temp, rdx_temp);
   5.130  
   5.131        // live at this point:
   5.132 @@ -675,24 +676,24 @@
   5.133        // (now we are done with the old MH)
   5.134  
   5.135        // original 32-bit vmdata word must be of this form:
   5.136 -      //    | MBZ:16 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
   5.137 -      __ xchgl(rcx, rbx_vminfo);                // free rcx for shifts
   5.138 +      //    | MBZ:6 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
   5.139 +      __ xchgptr(rcx, rbx_vminfo);                // free rcx for shifts
   5.140        __ shll(rdx_temp /*, rcx*/);
   5.141        Label zero_extend, done;
   5.142        __ testl(rcx, CONV_VMINFO_SIGN_FLAG);
   5.143 -      __ jcc(Assembler::zero, zero_extend);
   5.144 +      __ jccb(Assembler::zero, zero_extend);
   5.145  
   5.146        // this path is taken for int->byte, int->short
   5.147        __ sarl(rdx_temp /*, rcx*/);
   5.148 -      __ jmp(done);
   5.149 +      __ jmpb(done);
   5.150  
   5.151        __ bind(zero_extend);
   5.152        // this is taken for int->char
   5.153        __ shrl(rdx_temp /*, rcx*/);
   5.154  
   5.155        __ bind(done);
   5.156 -      __ movptr(vmarg, rdx_temp);
   5.157 -      __ xchgl(rcx, rbx_vminfo);                // restore rcx_recv
   5.158 +      __ movl(vmarg, rdx_temp);
   5.159 +      __ xchgptr(rcx, rbx_vminfo);                // restore rcx_recv
   5.160  
   5.161        __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
   5.162      }
   5.163 @@ -861,7 +862,7 @@
   5.164              // Verify that argslot > destslot, by at least swap_bytes.
   5.165              Label L_ok;
   5.166              __ cmpptr(rax_argslot, rbx_destslot);
   5.167 -            __ jcc(Assembler::aboveEqual, L_ok);
   5.168 +            __ jccb(Assembler::aboveEqual, L_ok);
   5.169              __ stop("source must be above destination (upward rotation)");
   5.170              __ bind(L_ok);
   5.171            }
   5.172 @@ -877,7 +878,7 @@
   5.173            __ movptr(Address(rax_argslot, swap_bytes), rdx_temp);
   5.174            __ addptr(rax_argslot, -wordSize);
   5.175            __ cmpptr(rax_argslot, rbx_destslot);
   5.176 -          __ jcc(Assembler::aboveEqual, loop);
   5.177 +          __ jccb(Assembler::aboveEqual, loop);
   5.178          } else {
   5.179            __ addptr(rax_argslot, swap_bytes);
   5.180  #ifdef ASSERT
   5.181 @@ -885,7 +886,7 @@
   5.182              // Verify that argslot < destslot, by at least swap_bytes.
   5.183              Label L_ok;
   5.184              __ cmpptr(rax_argslot, rbx_destslot);
   5.185 -            __ jcc(Assembler::belowEqual, L_ok);
   5.186 +            __ jccb(Assembler::belowEqual, L_ok);
   5.187              __ stop("source must be below destination (downward rotation)");
   5.188              __ bind(L_ok);
   5.189            }
   5.190 @@ -901,7 +902,7 @@
   5.191            __ movptr(Address(rax_argslot, -swap_bytes), rdx_temp);
   5.192            __ addptr(rax_argslot, wordSize);
   5.193            __ cmpptr(rax_argslot, rbx_destslot);
   5.194 -          __ jcc(Assembler::belowEqual, loop);
   5.195 +          __ jccb(Assembler::belowEqual, loop);
   5.196          }
   5.197  
   5.198          // pop the original first chunk into the destination slot, now free
   5.199 @@ -967,7 +968,7 @@
   5.200        __ addptr(rax_argslot, wordSize);
   5.201        __ addptr(rdx_newarg, wordSize);
   5.202        __ cmpptr(rdx_newarg, rbx_oldarg);
   5.203 -      __ jcc(Assembler::less, loop);
   5.204 +      __ jccb(Assembler::less, loop);
   5.205  
   5.206        __ pop(rdi);              // restore temp
   5.207  
   5.208 @@ -1119,7 +1120,7 @@
   5.209          }
   5.210          __ addptr(rax_argslot, Interpreter::stackElementSize());
   5.211          __ cmpptr(rax_argslot, rdx_argslot_limit);
   5.212 -        __ jcc(Assembler::less, loop);
   5.213 +        __ jccb(Assembler::less, loop);
   5.214        } else if (length_constant == 0) {
   5.215          __ bind(skip_array_check);
   5.216          // nothing to copy

     6.1 --- a/src/cpu/x86/vm/runtime_x86_32.cpp	Wed Dec 23 03:12:16 2009 -0800
     6.2 +++ b/src/cpu/x86/vm/runtime_x86_32.cpp	Wed Jan 06 22:21:39 2010 -0800
     6.3 @@ -43,11 +43,11 @@
     6.4  // This code is entered with a jmp.
     6.5  //
     6.6  // Arguments:
     6.7 -//   rax,: exception oop
     6.8 +//   rax: exception oop
     6.9  //   rdx: exception pc
    6.10  //
    6.11  // Results:
    6.12 -//   rax,: exception oop
    6.13 +//   rax: exception oop
    6.14  //   rdx: exception pc in caller or ???
    6.15  //   destination: exception handler of caller
    6.16  //
    6.17 @@ -113,17 +113,17 @@
    6.18    __ addptr(rsp, return_off * wordSize);   // Epilog!
    6.19    __ pop(rdx); // Exception pc
    6.20  
    6.21 +  // rax: exception handler for given <exception oop/exception pc>
    6.22  
    6.23 -  // rax,: exception handler for given <exception oop/exception pc>
    6.24 +  // Restore SP from BP if the exception PC is a MethodHandle call.
    6.25 +  __ cmpl(Address(rcx, JavaThread::is_method_handle_exception_offset()), 0);
    6.26 +  __ cmovptr(Assembler::notEqual, rsp, rbp);
    6.27  
    6.28    // We have a handler in rax, (could be deopt blob)
    6.29    // rdx - throwing pc, deopt blob will need it.
    6.30  
    6.31    __ push(rax);
    6.32  
    6.33 -  // rcx contains handler address
    6.34 -
    6.35 -  __ get_thread(rcx);           // TLS
    6.36    // Get the exception
    6.37    __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
    6.38    // Get the exception pc in case we are deoptimized
    6.39 @@ -137,7 +137,7 @@
    6.40  
    6.41    __ pop(rcx);
    6.42  
    6.43 -  // rax,: exception oop
    6.44 +  // rax: exception oop
    6.45    // rcx: exception handler
    6.46    // rdx: exception pc
    6.47    __ jmp (rcx);

     7.1 --- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Wed Dec 23 03:12:16 2009 -0800
     7.2 +++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Wed Jan 06 22:21:39 2010 -0800
     7.3 @@ -638,6 +638,10 @@
     7.4  
     7.5    __ movptr(rax, Address(rsp, 0));
     7.6  
     7.7 +  // Must preserve original SP for loading incoming arguments because
     7.8 +  // we need to align the outgoing SP for compiled code.
     7.9 +  __ movptr(r11, rsp);
    7.10 +
    7.11    // Cut-out for having no stack args.  Since up to 2 int/oop args are passed
    7.12    // in registers, we will occasionally have no stack args.
    7.13    int comp_words_on_stack = 0;
    7.14 @@ -661,6 +665,10 @@
    7.15    // as far as the placement of the call instruction
    7.16    __ push(rax);
    7.17  
    7.18 +  // Put saved SP in another register
    7.19 +  const Register saved_sp = rax;
    7.20 +  __ movptr(saved_sp, r11);
    7.21 +
    7.22    // Will jump to the compiled code just as if compiled code was doing it.
    7.23    // Pre-load the register-jump target early, to schedule it better.
    7.24    __ movptr(r11, Address(rbx, in_bytes(methodOopDesc::from_compiled_offset())));
    7.25 @@ -680,11 +688,7 @@
    7.26      assert(!regs[i].second()->is_valid() || regs[i].first()->next() == regs[i].second(),
    7.27              "scrambled load targets?");
    7.28      // Load in argument order going down.
    7.29 -    // int ld_off = (total_args_passed + comp_words_on_stack -i)*wordSize;
    7.30 -    // base ld_off on r13 (sender_sp) as the stack alignment makes offsets from rsp
    7.31 -    // unpredictable
    7.32 -    int ld_off = ((total_args_passed - 1) - i)*Interpreter::stackElementSize();
    7.33 -
    7.34 +    int ld_off = (total_args_passed - i)*Interpreter::stackElementSize() + Interpreter::value_offset_in_bytes();
    7.35      // Point to interpreter value (vs. tag)
    7.36      int next_off = ld_off - Interpreter::stackElementSize();
    7.37      //
    7.38 @@ -699,10 +703,14 @@
    7.39      if (r_1->is_stack()) {
    7.40        // Convert stack slot to an SP offset (+ wordSize to account for return address )
    7.41        int st_off = regs[i].first()->reg2stack()*VMRegImpl::stack_slot_size + wordSize;
    7.42 +
    7.43 +      // We can use r13 as a temp here because compiled code doesn't need r13 as an input
    7.44 +      // and if we end up going thru a c2i because of a miss a reasonable value of r13
    7.45 +      // will be generated.
    7.46        if (!r_2->is_valid()) {
    7.47          // sign extend???
    7.48 -        __ movl(rax, Address(r13, ld_off));
    7.49 -        __ movptr(Address(rsp, st_off), rax);
    7.50 +        __ movl(r13, Address(saved_sp, ld_off));
    7.51 +        __ movptr(Address(rsp, st_off), r13);
    7.52        } else {
    7.53          //
    7.54          // We are using two optoregs. This can be either T_OBJECT, T_ADDRESS, T_LONG, or T_DOUBLE
    7.55 @@ -715,9 +723,9 @@
    7.56          // ld_off is MSW so get LSW
    7.57          const int offset = (sig_bt[i]==T_LONG||sig_bt[i]==T_DOUBLE)?
    7.58                             next_off : ld_off;
    7.59 -        __ movq(rax, Address(r13, offset));
    7.60 +        __ movq(r13, Address(saved_sp, offset));
    7.61          // st_off is LSW (i.e. reg.first())
    7.62 -        __ movq(Address(rsp, st_off), rax);
    7.63 +        __ movq(Address(rsp, st_off), r13);
    7.64        }
    7.65      } else if (r_1->is_Register()) {  // Register argument
    7.66        Register r = r_1->as_Register();
    7.67 @@ -732,16 +740,16 @@
    7.68                             next_off : ld_off;
    7.69  
    7.70          // this can be a misaligned move
    7.71 -        __ movq(r, Address(r13, offset));
    7.72 +        __ movq(r, Address(saved_sp, offset));
    7.73        } else {
    7.74          // sign extend and use a full word?
    7.75 -        __ movl(r, Address(r13, ld_off));
    7.76 +        __ movl(r, Address(saved_sp, ld_off));
    7.77        }
    7.78      } else {
    7.79        if (!r_2->is_valid()) {
    7.80 -        __ movflt(r_1->as_XMMRegister(), Address(r13, ld_off));
    7.81 +        __ movflt(r_1->as_XMMRegister(), Address(saved_sp, ld_off));
    7.82        } else {
    7.83 -        __ movdbl(r_1->as_XMMRegister(), Address(r13, next_off));
    7.84 +        __ movdbl(r_1->as_XMMRegister(), Address(saved_sp, next_off));
    7.85        }
    7.86      }
    7.87    }
    7.88 @@ -3319,6 +3327,10 @@
    7.89  
    7.90    // rax: exception handler
    7.91  
    7.92 +  // Restore SP from BP if the exception PC is a MethodHandle call.
    7.93 +  __ cmpl(Address(r15_thread, JavaThread::is_method_handle_exception_offset()), 0);
    7.94 +  __ cmovptr(Assembler::notEqual, rsp, rbp);
    7.95 +
    7.96    // We have a handler in rax (could be deopt blob).
    7.97    __ mov(r8, rax);
    7.98  

     8.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed Dec 23 03:12:16 2009 -0800
     8.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed Jan 06 22:21:39 2010 -0800
     8.3 @@ -1488,7 +1488,10 @@
     8.4  
     8.5    if (interpreter_frame != NULL) {
     8.6  #ifdef ASSERT
     8.7 -    assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
     8.8 +    if (!EnableMethodHandles)
     8.9 +      // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
    8.10 +      // Probably, since deoptimization doesn't work yet.
    8.11 +      assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
    8.12      assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
    8.13  #endif
    8.14  

     9.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Wed Dec 23 03:12:16 2009 -0800
     9.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Wed Jan 06 22:21:39 2010 -0800
     9.3 @@ -449,8 +449,12 @@
     9.4    __ addptr(rax, stack_base);
     9.5    __ subptr(rax, stack_size);
     9.6  
     9.7 +  // Use the maximum number of pages we might bang.
     9.8 +  const int max_pages = StackShadowPages > (StackRedPages+StackYellowPages) ? StackShadowPages :
     9.9 +                                                                              (StackRedPages+StackYellowPages);
    9.10 +
    9.11    // add in the red and yellow zone sizes
    9.12 -  __ addptr(rax, (StackRedPages + StackYellowPages) * page_size);
    9.13 +  __ addptr(rax, max_pages * page_size);
    9.14  
    9.15    // check against the current stack bottom
    9.16    __ cmpptr(rsp, rax);
    9.17 @@ -1502,8 +1506,10 @@
    9.18           tempcount* Interpreter::stackElementWords() + popframe_extra_args;
    9.19    if (interpreter_frame != NULL) {
    9.20  #ifdef ASSERT
    9.21 -    assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(),
    9.22 -           "Frame not properly walkable");
    9.23 +    if (!EnableMethodHandles)
    9.24 +      // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
    9.25 +      // Probably, since deoptimization doesn't work yet.
    9.26 +      assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
    9.27      assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
    9.28  #endif
    9.29  

    10.1 --- a/src/cpu/x86/vm/x86_32.ad	Wed Dec 23 03:12:16 2009 -0800
    10.2 +++ b/src/cpu/x86/vm/x86_32.ad	Wed Jan 06 22:21:39 2010 -0800
    10.3 @@ -268,22 +268,36 @@
    10.4  static jlong *float_signflip_pool  = double_quadword(&fp_signmask_pool[3*2], CONST64(0x8000000080000000), CONST64(0x8000000080000000));
    10.5  static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], CONST64(0x8000000000000000), CONST64(0x8000000000000000));
    10.6  
    10.7 +// Offset hacking within calls.
    10.8 +static int pre_call_FPU_size() {
    10.9 +  if (Compile::current()->in_24_bit_fp_mode())
   10.10 +    return 6; // fldcw
   10.11 +  return 0;
   10.12 +}
   10.13 +
   10.14 +static int preserve_SP_size() {
   10.15 +  return LP64_ONLY(1 +) 2;  // [rex,] op, rm(reg/reg)
   10.16 +}
   10.17 +
   10.18  // !!!!! Special hack to get all type of calls to specify the byte offset
   10.19  //       from the start of the call to the point where the return address
   10.20  //       will point.
   10.21  int MachCallStaticJavaNode::ret_addr_offset() {
   10.22 -  return 5 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);  // 5 bytes from start of call to where return address points
   10.23 +  int offset = 5 + pre_call_FPU_size();  // 5 bytes from start of call to where return address points
   10.24 +  if (_method_handle_invoke)
   10.25 +    offset += preserve_SP_size();
   10.26 +  return offset;
   10.27  }
   10.28  
   10.29  int MachCallDynamicJavaNode::ret_addr_offset() {
   10.30 -  return 10 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);  // 10 bytes from start of call to where return address points
   10.31 +  return 10 + pre_call_FPU_size();  // 10 bytes from start of call to where return address points
   10.32  }
   10.33  
   10.34  static int sizeof_FFree_Float_Stack_All = -1;
   10.35  
   10.36  int MachCallRuntimeNode::ret_addr_offset() {
   10.37    assert(sizeof_FFree_Float_Stack_All != -1, "must have been emitted already");
   10.38 -  return sizeof_FFree_Float_Stack_All + 5 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);
   10.39 +  return sizeof_FFree_Float_Stack_All + 5 + pre_call_FPU_size();
   10.40  }
   10.41  
   10.42  // Indicate if the safepoint node needs the polling page as an input.
   10.43 @@ -299,8 +313,16 @@
   10.44  // The address of the call instruction needs to be 4-byte aligned to
   10.45  // ensure that it does not span a cache line so that it can be patched.
   10.46  int CallStaticJavaDirectNode::compute_padding(int current_offset) const {
   10.47 -  if (Compile::current()->in_24_bit_fp_mode())
   10.48 -    current_offset += 6;    // skip fldcw in pre_call_FPU, if any
   10.49 +  current_offset += pre_call_FPU_size();  // skip fldcw, if any
   10.50 +  current_offset += 1;      // skip call opcode byte
   10.51 +  return round_to(current_offset, alignment_required()) - current_offset;
   10.52 +}
   10.53 +
   10.54 +// The address of the call instruction needs to be 4-byte aligned to
   10.55 +// ensure that it does not span a cache line so that it can be patched.
   10.56 +int CallStaticJavaHandleNode::compute_padding(int current_offset) const {
   10.57 +  current_offset += pre_call_FPU_size();  // skip fldcw, if any
   10.58 +  current_offset += preserve_SP_size();   // skip mov rbp, rsp
   10.59    current_offset += 1;      // skip call opcode byte
   10.60    return round_to(current_offset, alignment_required()) - current_offset;
   10.61  }
   10.62 @@ -308,8 +330,7 @@
   10.63  // The address of the call instruction needs to be 4-byte aligned to
   10.64  // ensure that it does not span a cache line so that it can be patched.
   10.65  int CallDynamicJavaDirectNode::compute_padding(int current_offset) const {
   10.66 -  if (Compile::current()->in_24_bit_fp_mode())
   10.67 -    current_offset += 6;    // skip fldcw in pre_call_FPU, if any
   10.68 +  current_offset += pre_call_FPU_size();  // skip fldcw, if any
   10.69    current_offset += 5;      // skip MOV instruction
   10.70    current_offset += 1;      // skip call opcode byte
   10.71    return round_to(current_offset, alignment_required()) - current_offset;
   10.72 @@ -1460,6 +1481,10 @@
   10.73    return RegMask();
   10.74  }
   10.75  
   10.76 +const RegMask Matcher::method_handle_invoke_SP_save_mask() {
   10.77 +  return EBP_REG_mask;
   10.78 +}
   10.79 +
   10.80  %}
   10.81  
   10.82  //----------ENCODING BLOCK-----------------------------------------------------
   10.83 @@ -1772,10 +1797,13 @@
   10.84  
   10.85    enc_class pre_call_FPU %{
   10.86      // If method sets FPU control word restore it here
   10.87 +    debug_only(int off0 = cbuf.code_size());
   10.88      if( Compile::current()->in_24_bit_fp_mode() ) {
   10.89        MacroAssembler masm(&cbuf);
   10.90        masm.fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
   10.91      }
   10.92 +    debug_only(int off1 = cbuf.code_size());
   10.93 +    assert(off1 - off0 == pre_call_FPU_size(), "correct size prediction");
   10.94    %}
   10.95  
   10.96    enc_class post_call_FPU %{
   10.97 @@ -1786,6 +1814,21 @@
   10.98      }
   10.99    %}
  10.100  
  10.101 +  enc_class preserve_SP %{
  10.102 +    debug_only(int off0 = cbuf.code_size());
  10.103 +    MacroAssembler _masm(&cbuf);
  10.104 +    // RBP is preserved across all calls, even compiled calls.
  10.105 +    // Use it to preserve RSP in places where the callee might change the SP.
  10.106 +    __ movptr(rbp, rsp);
  10.107 +    debug_only(int off1 = cbuf.code_size());
  10.108 +    assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
  10.109 +  %}
  10.110 +
  10.111 +  enc_class restore_SP %{
  10.112 +    MacroAssembler _masm(&cbuf);
  10.113 +    __ movptr(rsp, rbp);
  10.114 +  %}
  10.115 +
  10.116    enc_class Java_Static_Call (method meth) %{    // JAVA STATIC CALL
  10.117      // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
  10.118      // who we intended to call.
  10.119 @@ -13406,6 +13449,7 @@
  10.120  //       compute_padding() functions will have to be adjusted.
  10.121  instruct CallStaticJavaDirect(method meth) %{
  10.122    match(CallStaticJava);
  10.123 +  predicate(! ((CallStaticJavaNode*)n)->is_method_handle_invoke());
  10.124    effect(USE meth);
  10.125  
  10.126    ins_cost(300);
  10.127 @@ -13420,6 +13464,30 @@
  10.128    ins_alignment(4);
  10.129  %}
  10.130  
  10.131 +// Call Java Static Instruction (method handle version)
  10.132 +// Note: If this code changes, the corresponding ret_addr_offset() and
  10.133 +//       compute_padding() functions will have to be adjusted.
  10.134 +instruct CallStaticJavaHandle(method meth, eBPRegP ebp) %{
  10.135 +  match(CallStaticJava);
  10.136 +  predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke());
  10.137 +  effect(USE meth);
  10.138 +  // EBP is saved by all callees (for interpreter stack correction).
  10.139 +  // We use it here for a similar purpose, in {preserve,restore}_SP.
  10.140 +
  10.141 +  ins_cost(300);
  10.142 +  format %{ "CALL,static/MethodHandle " %}
  10.143 +  opcode(0xE8); /* E8 cd */
  10.144 +  ins_encode( pre_call_FPU,
  10.145 +              preserve_SP,
  10.146 +              Java_Static_Call( meth ),
  10.147 +              restore_SP,
  10.148 +              call_epilog,
  10.149 +              post_call_FPU );
  10.150 +  ins_pipe( pipe_slow );
  10.151 +  ins_pc_relative(1);
  10.152 +  ins_alignment(4);
  10.153 +%}
  10.154 +
  10.155  // Call Java Dynamic Instruction
  10.156  // Note: If this code changes, the corresponding ret_addr_offset() and
  10.157  //       compute_padding() functions will have to be adjusted.

    11.1 --- a/src/cpu/x86/vm/x86_64.ad	Wed Dec 23 03:12:16 2009 -0800
    11.2 +++ b/src/cpu/x86/vm/x86_64.ad	Wed Jan 06 22:21:39 2010 -0800
    11.3 @@ -551,12 +551,19 @@
    11.4  
    11.5  #define __ _masm.
    11.6  
    11.7 +static int preserve_SP_size() {
    11.8 +  return LP64_ONLY(1 +) 2;  // [rex,] op, rm(reg/reg)
    11.9 +}
   11.10 +
   11.11  // !!!!! Special hack to get all types of calls to specify the byte offset
   11.12  //       from the start of the call to the point where the return address
   11.13  //       will point.
   11.14  int MachCallStaticJavaNode::ret_addr_offset()
   11.15  {
   11.16 -  return 5; // 5 bytes from start of call to where return address points
   11.17 +  int offset = 5; // 5 bytes from start of call to where return address points
   11.18 +  if (_method_handle_invoke)
   11.19 +    offset += preserve_SP_size();
   11.20 +  return offset;
   11.21  }
   11.22  
   11.23  int MachCallDynamicJavaNode::ret_addr_offset()
   11.24 @@ -589,6 +596,15 @@
   11.25  
   11.26  // The address of the call instruction needs to be 4-byte aligned to
   11.27  // ensure that it does not span a cache line so that it can be patched.
   11.28 +int CallStaticJavaHandleNode::compute_padding(int current_offset) const
   11.29 +{
   11.30 +  current_offset += preserve_SP_size();   // skip mov rbp, rsp
   11.31 +  current_offset += 1; // skip call opcode byte
   11.32 +  return round_to(current_offset, alignment_required()) - current_offset;
   11.33 +}
   11.34 +
   11.35 +// The address of the call instruction needs to be 4-byte aligned to
   11.36 +// ensure that it does not span a cache line so that it can be patched.
   11.37  int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
   11.38  {
   11.39    current_offset += 11; // skip movq instruction + call opcode byte
   11.40 @@ -2113,6 +2129,10 @@
   11.41    return LONG_RDX_REG_mask;
   11.42  }
   11.43  
   11.44 +const RegMask Matcher::method_handle_invoke_SP_save_mask() {
   11.45 +  return PTR_RBP_REG_mask;
   11.46 +}
   11.47 +
   11.48  static Address build_address(int b, int i, int s, int d) {
   11.49    Register index = as_Register(i);
   11.50    Address::ScaleFactor scale = (Address::ScaleFactor)s;
   11.51 @@ -2608,6 +2628,21 @@
   11.52                     RELOC_DISP32);
   11.53    %}
   11.54  
   11.55 +  enc_class preserve_SP %{
   11.56 +    debug_only(int off0 = cbuf.code_size());
   11.57 +    MacroAssembler _masm(&cbuf);
   11.58 +    // RBP is preserved across all calls, even compiled calls.
   11.59 +    // Use it to preserve RSP in places where the callee might change the SP.
   11.60 +    __ movptr(rbp, rsp);
   11.61 +    debug_only(int off1 = cbuf.code_size());
   11.62 +    assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
   11.63 +  %}
   11.64 +
   11.65 +  enc_class restore_SP %{
   11.66 +    MacroAssembler _masm(&cbuf);
   11.67 +    __ movptr(rsp, rbp);
   11.68 +  %}
   11.69 +
   11.70    enc_class Java_Static_Call(method meth)
   11.71    %{
   11.72      // JAVA STATIC CALL
   11.73 @@ -12526,9 +12561,9 @@
   11.74  // Call Java Static Instruction
   11.75  // Note: If this code changes, the corresponding ret_addr_offset() and
   11.76  //       compute_padding() functions will have to be adjusted.
   11.77 -instruct CallStaticJavaDirect(method meth)
   11.78 -%{
   11.79 +instruct CallStaticJavaDirect(method meth) %{
   11.80    match(CallStaticJava);
   11.81 +  predicate(!((CallStaticJavaNode*) n)->is_method_handle_invoke());
   11.82    effect(USE meth);
   11.83  
   11.84    ins_cost(300);
   11.85 @@ -12540,6 +12575,28 @@
   11.86    ins_alignment(4);
   11.87  %}
   11.88  
   11.89 +// Call Java Static Instruction (method handle version)
   11.90 +// Note: If this code changes, the corresponding ret_addr_offset() and
   11.91 +//       compute_padding() functions will have to be adjusted.
   11.92 +instruct CallStaticJavaHandle(method meth, rbp_RegP rbp) %{
   11.93 +  match(CallStaticJava);
   11.94 +  predicate(((CallStaticJavaNode*) n)->is_method_handle_invoke());
   11.95 +  effect(USE meth);
   11.96 +  // RBP is saved by all callees (for interpreter stack correction).
   11.97 +  // We use it here for a similar purpose, in {preserve,restore}_SP.
   11.98 +
   11.99 +  ins_cost(300);
  11.100 +  format %{ "call,static/MethodHandle " %}
  11.101 +  opcode(0xE8); /* E8 cd */
  11.102 +  ins_encode(preserve_SP,
  11.103 +             Java_Static_Call(meth),
  11.104 +             restore_SP,
  11.105 +             call_epilog);
  11.106 +  ins_pipe(pipe_slow);
  11.107 +  ins_pc_relative(1);
  11.108 +  ins_alignment(4);
  11.109 +%}
  11.110 +
  11.111  // Call Java Dynamic Instruction
  11.112  // Note: If this code changes, the corresponding ret_addr_offset() and
  11.113  //       compute_padding() functions will have to be adjusted.

    12.1 --- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Dec 23 03:12:16 2009 -0800
    12.2 +++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Jan 06 22:21:39 2010 -0800
    12.3 @@ -245,7 +245,7 @@
    12.4      if (handlerAddr == NULL) {
    12.5        CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
    12.6        if (HAS_PENDING_EXCEPTION)
    12.7 -        goto unwind_and_return;
    12.8 +        goto unlock_unwind_and_return;
    12.9  
   12.10        handlerAddr = method->signature_handler();
   12.11        assert(handlerAddr != NULL, "eh?");
   12.12 @@ -254,7 +254,7 @@
   12.13        CALL_VM_NOCHECK(handlerAddr =
   12.14          InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
   12.15        if (HAS_PENDING_EXCEPTION)
   12.16 -        goto unwind_and_return;
   12.17 +        goto unlock_unwind_and_return;
   12.18      }
   12.19      handler = \
   12.20        InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
   12.21 @@ -365,10 +365,10 @@
   12.22    // Reset handle block
   12.23    thread->active_handles()->clear();
   12.24  
   12.25 -  // Unlock if necessary.  It seems totally wrong that this
   12.26 -  // is skipped in the event of an exception but apparently
   12.27 -  // the template interpreter does this so we do too.
   12.28 -  if (monitor && !HAS_PENDING_EXCEPTION) {
   12.29 + unlock_unwind_and_return:
   12.30 +
   12.31 +  // Unlock if necessary
   12.32 +  if (monitor) {
   12.33      BasicLock *lock = monitor->lock();
   12.34      markOop header = lock->displaced_header();
   12.35      oop rcvr = monitor->obj();

    13.1 --- a/src/share/vm/c1/c1_IR.hpp	Wed Dec 23 03:12:16 2009 -0800
    13.2 +++ b/src/share/vm/c1/c1_IR.hpp	Wed Jan 06 22:21:39 2010 -0800
    13.3 @@ -251,8 +251,9 @@
    13.4      DebugToken* expvals = recorder->create_scope_values(expressions());
    13.5      DebugToken* monvals = recorder->create_monitor_values(monitors());
    13.6      // reexecute allowed only for the topmost frame
    13.7 -    bool      reexecute = topmost ? should_reexecute() : false;
    13.8 -    recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, locvals, expvals, monvals);
    13.9 +    bool reexecute = topmost ? should_reexecute() : false;
   13.10 +    bool is_method_handle_invoke = false;
   13.11 +    recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, is_method_handle_invoke, locvals, expvals, monvals);
   13.12    }
   13.13  };
   13.14  

    14.1 --- a/src/share/vm/c1/c1_Runtime1.cpp	Wed Dec 23 03:12:16 2009 -0800
    14.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp	Wed Jan 06 22:21:39 2010 -0800
    14.3 @@ -425,7 +425,7 @@
    14.4    assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
    14.5    assert(exception->is_oop(), "just checking");
    14.6    // Check that exception is a subclass of Throwable, otherwise we have a VerifyError
    14.7 -  if (!(exception->is_a(SystemDictionary::throwable_klass()))) {
    14.8 +  if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
    14.9      if (ExitVMOnVerifyError) vm_exit(-1);
   14.10      ShouldNotReachHere();
   14.11    }

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/src/share/vm/ci/ciCPCache.cpp	Wed Jan 06 22:21:39 2010 -0800
    15.3 @@ -0,0 +1,49 @@
    15.4 +/*
    15.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    15.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.7 + *
    15.8 + * This code is free software; you can redistribute it and/or modify it
    15.9 + * under the terms of the GNU General Public License version 2 only, as
   15.10 + * published by the Free Software Foundation.
   15.11 + *
   15.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   15.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   15.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   15.15 + * version 2 for more details (a copy is included in the LICENSE file that
   15.16 + * accompanied this code).
   15.17 + *
   15.18 + * You should have received a copy of the GNU General Public License version
   15.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   15.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   15.21 + *
   15.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   15.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   15.24 + * have any questions.
   15.25 + *
   15.26 + */
   15.27 +
   15.28 +#include "incls/_precompiled.incl"
   15.29 +#include "incls/_ciCPCache.cpp.incl"
   15.30 +
   15.31 +// ciCPCache
   15.32 +
   15.33 +// ------------------------------------------------------------------
   15.34 +// ciCPCache::get_f1_offset
   15.35 +size_t ciCPCache::get_f1_offset(int index) {
   15.36 +  // Calculate the offset from the constantPoolCacheOop to the f1
   15.37 +  // field.
   15.38 +  ByteSize f1_offset =
   15.39 +    constantPoolCacheOopDesc::entry_offset(index) +
   15.40 +    ConstantPoolCacheEntry::f1_offset();
   15.41 +
   15.42 +  return in_bytes(f1_offset);
   15.43 +}
   15.44 +
   15.45 +
   15.46 +// ------------------------------------------------------------------
   15.47 +// ciCPCache::print
   15.48 +//
   15.49 +// Print debugging information about the cache.
   15.50 +void ciCPCache::print() {
   15.51 +  Unimplemented();
   15.52 +}

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/src/share/vm/ci/ciCPCache.hpp	Wed Jan 06 22:21:39 2010 -0800
    16.3 @@ -0,0 +1,43 @@
    16.4 +/*
    16.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    16.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.7 + *
    16.8 + * This code is free software; you can redistribute it and/or modify it
    16.9 + * under the terms of the GNU General Public License version 2 only, as
   16.10 + * published by the Free Software Foundation.
   16.11 + *
   16.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   16.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   16.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   16.15 + * version 2 for more details (a copy is included in the LICENSE file that
   16.16 + * accompanied this code).
   16.17 + *
   16.18 + * You should have received a copy of the GNU General Public License version
   16.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   16.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   16.21 + *
   16.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   16.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   16.24 + * have any questions.
   16.25 + *
   16.26 + */
   16.27 +
   16.28 +// ciCPCache
   16.29 +//
   16.30 +// This class represents a constant pool cache.
   16.31 +//
   16.32 +// Note: This class is called ciCPCache as ciConstantPoolCache is used
   16.33 +// for something different.
   16.34 +class ciCPCache : public ciObject {
   16.35 +public:
   16.36 +  ciCPCache(constantPoolCacheHandle cpcache) : ciObject(cpcache) {}
   16.37 +
   16.38 +  // What kind of ciObject is this?
   16.39 +  bool is_cpcache() const { return true; }
   16.40 +
   16.41 +  // Get the offset in bytes from the oop to the f1 field of the
   16.42 +  // requested entry.
   16.43 +  size_t get_f1_offset(int index);
   16.44 +
   16.45 +  void print();
   16.46 +};

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/src/share/vm/ci/ciCallSite.cpp	Wed Jan 06 22:21:39 2010 -0800
    17.3 @@ -0,0 +1,46 @@
    17.4 +/*
    17.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    17.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.7 + *
    17.8 + * This code is free software; you can redistribute it and/or modify it
    17.9 + * under the terms of the GNU General Public License version 2 only, as
   17.10 + * published by the Free Software Foundation.
   17.11 + *
   17.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   17.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   17.15 + * version 2 for more details (a copy is included in the LICENSE file that
   17.16 + * accompanied this code).
   17.17 + *
   17.18 + * You should have received a copy of the GNU General Public License version
   17.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   17.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.21 + *
   17.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   17.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   17.24 + * have any questions.
   17.25 + *
   17.26 + */
   17.27 +
   17.28 +#include "incls/_precompiled.incl"
   17.29 +#include "incls/_ciCallSite.cpp.incl"
   17.30 +
   17.31 +// ciCallSite
   17.32 +
   17.33 +// ------------------------------------------------------------------
   17.34 +// ciCallSite::get_target
   17.35 +//
   17.36 +// Return the target MethodHandle of this CallSite.
   17.37 +ciMethodHandle* ciCallSite::get_target() const {
   17.38 +  VM_ENTRY_MARK;
   17.39 +  oop method_handle_oop = java_dyn_CallSite::target(get_oop());
   17.40 +  return CURRENT_ENV->get_object(method_handle_oop)->as_method_handle();
   17.41 +}
   17.42 +
   17.43 +// ------------------------------------------------------------------
   17.44 +// ciCallSite::print
   17.45 +//
   17.46 +// Print debugging information about the CallSite.
   17.47 +void ciCallSite::print() {
   17.48 +  Unimplemented();
   17.49 +}

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/src/share/vm/ci/ciCallSite.hpp	Wed Jan 06 22:21:39 2010 -0800
    18.3 @@ -0,0 +1,39 @@
    18.4 +/*
    18.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    18.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.7 + *
    18.8 + * This code is free software; you can redistribute it and/or modify it
    18.9 + * under the terms of the GNU General Public License version 2 only, as
   18.10 + * published by the Free Software Foundation.
   18.11 + *
   18.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   18.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.15 + * version 2 for more details (a copy is included in the LICENSE file that
   18.16 + * accompanied this code).
   18.17 + *
   18.18 + * You should have received a copy of the GNU General Public License version
   18.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   18.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.21 + *
   18.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   18.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   18.24 + * have any questions.
   18.25 + *
   18.26 + */
   18.27 +
   18.28 +// ciCallSite
   18.29 +//
   18.30 +// The class represents a java.dyn.CallSite object.
   18.31 +class ciCallSite : public ciInstance {
   18.32 +public:
   18.33 +  ciCallSite(instanceHandle h_i) : ciInstance(h_i) {}
   18.34 +
   18.35 +  // What kind of ciObject is this?
   18.36 +  bool is_call_site() const { return true; }
   18.37 +
   18.38 +  // Return the target MethodHandle of this CallSite.
   18.39 +  ciMethodHandle* get_target() const;
   18.40 +
   18.41 +  void print();
   18.42 +};

    19.1 --- a/src/share/vm/ci/ciClassList.hpp	Wed Dec 23 03:12:16 2009 -0800
    19.2 +++ b/src/share/vm/ci/ciClassList.hpp	Wed Jan 06 22:21:39 2010 -0800
    19.3 @@ -25,6 +25,7 @@
    19.4  class ciEnv;
    19.5  class ciObjectFactory;
    19.6  class ciConstantPoolCache;
    19.7 +class ciCPCache;
    19.8  
    19.9  class ciField;
   19.10  class ciConstant;
   19.11 @@ -42,6 +43,8 @@
   19.12  class ciObject;
   19.13  class   ciNullObject;
   19.14  class   ciInstance;
   19.15 +class     ciCallSite;
   19.16 +class     ciMethodHandle;
   19.17  class   ciMethod;
   19.18  class   ciMethodData;
   19.19  class     ciReceiverTypeData;  // part of ciMethodData
   19.20 @@ -78,6 +81,7 @@
   19.21  // Any more access must be given explicitly.
   19.22  #define CI_PACKAGE_ACCESS_TO           \
   19.23  friend class ciObjectFactory;          \
   19.24 +friend class ciCallSite;               \
   19.25  friend class ciConstantPoolCache;      \
   19.26  friend class ciField;                  \
   19.27  friend class ciConstant;               \
   19.28 @@ -93,6 +97,7 @@
   19.29  friend class ciInstance;               \
   19.30  friend class ciMethod;                 \
   19.31  friend class ciMethodData;             \
   19.32 +friend class ciMethodHandle;           \
   19.33  friend class ciReceiverTypeData;       \
   19.34  friend class ciSymbol;                 \
   19.35  friend class ciArray;                  \

    20.1 --- a/src/share/vm/ci/ciEnv.cpp	Wed Dec 23 03:12:16 2009 -0800
    20.2 +++ b/src/share/vm/ci/ciEnv.cpp	Wed Jan 06 22:21:39 2010 -0800
    20.3 @@ -38,17 +38,9 @@
    20.4  ciTypeArrayKlassKlass* ciEnv::_type_array_klass_klass_instance;
    20.5  ciObjArrayKlassKlass*  ciEnv::_obj_array_klass_klass_instance;
    20.6  
    20.7 -ciInstanceKlass* ciEnv::_ArrayStoreException;
    20.8 -ciInstanceKlass* ciEnv::_Class;
    20.9 -ciInstanceKlass* ciEnv::_ClassCastException;
   20.10 -ciInstanceKlass* ciEnv::_Object;
   20.11 -ciInstanceKlass* ciEnv::_Throwable;
   20.12 -ciInstanceKlass* ciEnv::_Thread;
   20.13 -ciInstanceKlass* ciEnv::_OutOfMemoryError;
   20.14 -ciInstanceKlass* ciEnv::_String;
   20.15 -ciInstanceKlass* ciEnv::_StringBuffer;
   20.16 -ciInstanceKlass* ciEnv::_StringBuilder;
   20.17 -ciInstanceKlass* ciEnv::_Integer;
   20.18 +#define WK_KLASS_DEFN(name, ignore_s, ignore_o) ciInstanceKlass* ciEnv::_##name = NULL;
   20.19 +WK_KLASSES_DO(WK_KLASS_DEFN)
   20.20 +#undef WK_KLASS_DEFN
   20.21  
   20.22  ciSymbol*        ciEnv::_unloaded_cisymbol = NULL;
   20.23  ciInstanceKlass* ciEnv::_unloaded_ciinstance_klass = NULL;
   20.24 @@ -442,12 +434,11 @@
   20.25  // ciEnv::get_klass_by_index_impl
   20.26  //
   20.27  // Implementation of get_klass_by_index.
   20.28 -ciKlass* ciEnv::get_klass_by_index_impl(ciInstanceKlass* accessor,
   20.29 +ciKlass* ciEnv::get_klass_by_index_impl(constantPoolHandle cpool,
   20.30                                          int index,
   20.31 -                                        bool& is_accessible) {
   20.32 -  assert(accessor->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
   20.33 +                                        bool& is_accessible,
   20.34 +                                        ciInstanceKlass* accessor) {
   20.35    EXCEPTION_CONTEXT;
   20.36 -  constantPoolHandle cpool(THREAD, accessor->get_instanceKlass()->constants());
   20.37    KlassHandle klass (THREAD, constantPoolOopDesc::klass_at_if_loaded(cpool, index));
   20.38    symbolHandle klass_name;
   20.39    if (klass.is_null()) {
   20.40 @@ -509,22 +500,21 @@
   20.41  // ciEnv::get_klass_by_index
   20.42  //
   20.43  // Get a klass from the constant pool.
   20.44 -ciKlass* ciEnv::get_klass_by_index(ciInstanceKlass* accessor,
   20.45 +ciKlass* ciEnv::get_klass_by_index(constantPoolHandle cpool,
   20.46                                     int index,
   20.47 -                                   bool& is_accessible) {
   20.48 -  GUARDED_VM_ENTRY(return get_klass_by_index_impl(accessor, index, is_accessible);)
   20.49 +                                   bool& is_accessible,
   20.50 +                                   ciInstanceKlass* accessor) {
   20.51 +  GUARDED_VM_ENTRY(return get_klass_by_index_impl(cpool, index, is_accessible, accessor);)
   20.52  }
   20.53  
   20.54  // ------------------------------------------------------------------
   20.55  // ciEnv::get_constant_by_index_impl
   20.56  //
   20.57  // Implementation of get_constant_by_index().
   20.58 -ciConstant ciEnv::get_constant_by_index_impl(ciInstanceKlass* accessor,
   20.59 -                                             int index) {
   20.60 +ciConstant ciEnv::get_constant_by_index_impl(constantPoolHandle cpool,
   20.61 +                                             int index,
   20.62 +                                             ciInstanceKlass* accessor) {
   20.63    EXCEPTION_CONTEXT;
   20.64 -  instanceKlass* ik_accessor = accessor->get_instanceKlass();
   20.65 -  assert(ik_accessor->is_linked(), "must be linked before accessing constant pool");
   20.66 -  constantPoolOop cpool = ik_accessor->constants();
   20.67    constantTag tag = cpool->tag_at(index);
   20.68    if (tag.is_int()) {
   20.69      return ciConstant(T_INT, (jint)cpool->int_at(index));
   20.70 @@ -552,7 +542,7 @@
   20.71    } else if (tag.is_klass() || tag.is_unresolved_klass()) {
   20.72      // 4881222: allow ldc to take a class type
   20.73      bool ignore;
   20.74 -    ciKlass* klass = get_klass_by_index_impl(accessor, index, ignore);
   20.75 +    ciKlass* klass = get_klass_by_index_impl(cpool, index, ignore, accessor);
   20.76      if (HAS_PENDING_EXCEPTION) {
   20.77        CLEAR_PENDING_EXCEPTION;
   20.78        record_out_of_memory_failure();
   20.79 @@ -561,6 +551,11 @@
   20.80      assert (klass->is_instance_klass() || klass->is_array_klass(),
   20.81              "must be an instance or array klass ");
   20.82      return ciConstant(T_OBJECT, klass);
   20.83 +  } else if (tag.is_object()) {
   20.84 +    oop obj = cpool->object_at(index);
   20.85 +    assert(obj->is_instance(), "must be an instance");
   20.86 +    ciObject* ciobj = get_object(obj);
   20.87 +    return ciConstant(T_OBJECT, ciobj);
   20.88    } else {
   20.89      ShouldNotReachHere();
   20.90      return ciConstant();
   20.91 @@ -597,9 +592,10 @@
   20.92  // Pull a constant out of the constant pool.  How appropriate.
   20.93  //
   20.94  // Implementation note: this query is currently in no way cached.
   20.95 -ciConstant ciEnv::get_constant_by_index(ciInstanceKlass* accessor,
   20.96 -                                        int index) {
   20.97 -  GUARDED_VM_ENTRY(return get_constant_by_index_impl(accessor, index); )
   20.98 +ciConstant ciEnv::get_constant_by_index(constantPoolHandle cpool,
   20.99 +                                        int index,
  20.100 +                                        ciInstanceKlass* accessor) {
  20.101 +  GUARDED_VM_ENTRY(return get_constant_by_index_impl(cpool, index, accessor);)
  20.102  }
  20.103  
  20.104  // ------------------------------------------------------------------
  20.105 @@ -609,7 +605,7 @@
  20.106  //
  20.107  // Implementation note: this query is currently in no way cached.
  20.108  bool ciEnv::is_unresolved_string(ciInstanceKlass* accessor,
  20.109 -                                        int index) const {
  20.110 +                                 int index) const {
  20.111    GUARDED_VM_ENTRY(return is_unresolved_string_impl(accessor->get_instanceKlass(), index); )
  20.112  }
  20.113  
  20.114 @@ -620,7 +616,7 @@
  20.115  //
  20.116  // Implementation note: this query is currently in no way cached.
  20.117  bool ciEnv::is_unresolved_klass(ciInstanceKlass* accessor,
  20.118 -                                        int index) const {
  20.119 +                                int index) const {
  20.120    GUARDED_VM_ENTRY(return is_unresolved_klass_impl(accessor->get_instanceKlass(), index); )
  20.121  }
  20.122  
  20.123 @@ -701,15 +697,12 @@
  20.124  
  20.125  // ------------------------------------------------------------------
  20.126  // ciEnv::get_method_by_index_impl
  20.127 -ciMethod* ciEnv::get_method_by_index_impl(ciInstanceKlass* accessor,
  20.128 -                                     int index, Bytecodes::Code bc) {
  20.129 -  // Get the method's declared holder.
  20.130 -
  20.131 -  assert(accessor->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
  20.132 -  constantPoolHandle cpool = accessor->get_instanceKlass()->constants();
  20.133 +ciMethod* ciEnv::get_method_by_index_impl(constantPoolHandle cpool,
  20.134 +                                          int index, Bytecodes::Code bc,
  20.135 +                                          ciInstanceKlass* accessor) {
  20.136    int holder_index = cpool->klass_ref_index_at(index);
  20.137    bool holder_is_accessible;
  20.138 -  ciKlass* holder = get_klass_by_index_impl(accessor, holder_index, holder_is_accessible);
  20.139 +  ciKlass* holder = get_klass_by_index_impl(cpool, holder_index, holder_is_accessible, accessor);
  20.140    ciInstanceKlass* declared_holder = get_instance_klass_for_declared_method_holder(holder);
  20.141  
  20.142    // Get the method's name and signature.
  20.143 @@ -736,6 +729,33 @@
  20.144  
  20.145  
  20.146  // ------------------------------------------------------------------
  20.147 +// ciEnv::get_fake_invokedynamic_method_impl
  20.148 +ciMethod* ciEnv::get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
  20.149 +                                                    int index, Bytecodes::Code bc) {
  20.150 +  assert(bc == Bytecodes::_invokedynamic, "must be invokedynamic");
  20.151 +
  20.152 +  // Get the CallSite from the constant pool cache.
  20.153 +  ConstantPoolCacheEntry* cpc_entry = cpool->cache()->secondary_entry_at(index);
  20.154 +  assert(cpc_entry != NULL && cpc_entry->is_secondary_entry(), "sanity");
  20.155 +  Handle call_site = cpc_entry->f1();
  20.156 +
  20.157 +  // Call site might not be linked yet.
  20.158 +  if (call_site.is_null()) {
  20.159 +    ciInstanceKlass* mh_klass = get_object(SystemDictionary::MethodHandle_klass())->as_instance_klass();
  20.160 +    ciSymbol*       sig_sym   = get_object(cpool->signature_ref_at(index))->as_symbol();
  20.161 +    return get_unloaded_method(mh_klass, ciSymbol::invoke_name(), sig_sym);
  20.162 +  }
  20.163 +
  20.164 +  // Get the methodOop from the CallSite.
  20.165 +  methodOop method_oop = (methodOop) java_dyn_CallSite::vmmethod(call_site());
  20.166 +  assert(method_oop != NULL, "sanity");
  20.167 +  assert(method_oop->is_method_handle_invoke(), "consistent");
  20.168 +
  20.169 +  return get_object(method_oop)->as_method();
  20.170 +}
  20.171 +
  20.172 +
  20.173 +// ------------------------------------------------------------------
  20.174  // ciEnv::get_instance_klass_for_declared_method_holder
  20.175  ciInstanceKlass* ciEnv::get_instance_klass_for_declared_method_holder(ciKlass* method_holder) {
  20.176    // For the case of <array>.clone(), the method holder can be a ciArrayKlass
  20.177 @@ -757,15 +777,19 @@
  20.178  }
  20.179  
  20.180  
  20.181 -
  20.182 -
  20.183  // ------------------------------------------------------------------
  20.184  // ciEnv::get_method_by_index
  20.185 -ciMethod* ciEnv::get_method_by_index(ciInstanceKlass* accessor,
  20.186 -                                     int index, Bytecodes::Code bc) {
  20.187 -  GUARDED_VM_ENTRY(return get_method_by_index_impl(accessor, index, bc);)
  20.188 +ciMethod* ciEnv::get_method_by_index(constantPoolHandle cpool,
  20.189 +                                     int index, Bytecodes::Code bc,
  20.190 +                                     ciInstanceKlass* accessor) {
  20.191 +  if (bc == Bytecodes::_invokedynamic) {
  20.192 +    GUARDED_VM_ENTRY(return get_fake_invokedynamic_method_impl(cpool, index, bc);)
  20.193 +  } else {
  20.194 +    GUARDED_VM_ENTRY(return get_method_by_index_impl(cpool, index, bc, accessor);)
  20.195 +  }
  20.196  }
  20.197  
  20.198 +
  20.199  // ------------------------------------------------------------------
  20.200  // ciEnv::name_buffer
  20.201  char *ciEnv::name_buffer(int req_len) {

    21.1 --- a/src/share/vm/ci/ciEnv.hpp	Wed Dec 23 03:12:16 2009 -0800
    21.2 +++ b/src/share/vm/ci/ciEnv.hpp	Wed Jan 06 22:21:39 2010 -0800
    21.3 @@ -74,17 +74,9 @@
    21.4    static ciTypeArrayKlassKlass* _type_array_klass_klass_instance;
    21.5    static ciObjArrayKlassKlass*  _obj_array_klass_klass_instance;
    21.6  
    21.7 -  static ciInstanceKlass* _ArrayStoreException;
    21.8 -  static ciInstanceKlass* _Class;
    21.9 -  static ciInstanceKlass* _ClassCastException;
   21.10 -  static ciInstanceKlass* _Object;
   21.11 -  static ciInstanceKlass* _Throwable;
   21.12 -  static ciInstanceKlass* _Thread;
   21.13 -  static ciInstanceKlass* _OutOfMemoryError;
   21.14 -  static ciInstanceKlass* _String;
   21.15 -  static ciInstanceKlass* _StringBuffer;
   21.16 -  static ciInstanceKlass* _StringBuilder;
   21.17 -  static ciInstanceKlass* _Integer;
   21.18 +#define WK_KLASS_DECL(name, ignore_s, ignore_o) static ciInstanceKlass* _##name;
   21.19 +  WK_KLASSES_DO(WK_KLASS_DECL)
   21.20 +#undef WK_KLASS_DECL
   21.21  
   21.22    static ciSymbol*        _unloaded_cisymbol;
   21.23    static ciInstanceKlass* _unloaded_ciinstance_klass;
   21.24 @@ -120,37 +112,45 @@
   21.25                               bool require_local);
   21.26  
   21.27    // Constant pool access.
   21.28 -  ciKlass*   get_klass_by_index(ciInstanceKlass* loading_klass,
   21.29 +  ciKlass*   get_klass_by_index(constantPoolHandle cpool,
   21.30                                  int klass_index,
   21.31 -                                bool& is_accessible);
   21.32 -  ciConstant get_constant_by_index(ciInstanceKlass* loading_klass,
   21.33 -                                   int constant_index);
   21.34 +                                bool& is_accessible,
   21.35 +                                ciInstanceKlass* loading_klass);
   21.36 +  ciConstant get_constant_by_index(constantPoolHandle cpool,
   21.37 +                                   int constant_index,
   21.38 +                                   ciInstanceKlass* accessor);
   21.39    bool       is_unresolved_string(ciInstanceKlass* loading_klass,
   21.40                                     int constant_index) const;
   21.41    bool       is_unresolved_klass(ciInstanceKlass* loading_klass,
   21.42                                     int constant_index) const;
   21.43    ciField*   get_field_by_index(ciInstanceKlass* loading_klass,
   21.44                                  int field_index);
   21.45 -  ciMethod*  get_method_by_index(ciInstanceKlass* loading_klass,
   21.46 -                                 int method_index, Bytecodes::Code bc);
   21.47 +  ciMethod*  get_method_by_index(constantPoolHandle cpool,
   21.48 +                                 int method_index, Bytecodes::Code bc,
   21.49 +                                 ciInstanceKlass* loading_klass);
   21.50  
   21.51    // Implementation methods for loading and constant pool access.
   21.52    ciKlass* get_klass_by_name_impl(ciKlass* accessing_klass,
   21.53                                    ciSymbol* klass_name,
   21.54                                    bool require_local);
   21.55 -  ciKlass*   get_klass_by_index_impl(ciInstanceKlass* loading_klass,
   21.56 +  ciKlass*   get_klass_by_index_impl(constantPoolHandle cpool,
   21.57                                       int klass_index,
   21.58 -                                     bool& is_accessible);
   21.59 -  ciConstant get_constant_by_index_impl(ciInstanceKlass* loading_klass,
   21.60 -                                        int constant_index);
   21.61 +                                     bool& is_accessible,
   21.62 +                                     ciInstanceKlass* loading_klass);
   21.63 +  ciConstant get_constant_by_index_impl(constantPoolHandle cpool,
   21.64 +                                        int constant_index,
   21.65 +                                        ciInstanceKlass* loading_klass);
   21.66    bool       is_unresolved_string_impl (instanceKlass* loading_klass,
   21.67                                          int constant_index) const;
   21.68    bool       is_unresolved_klass_impl (instanceKlass* loading_klass,
   21.69                                          int constant_index) const;
   21.70    ciField*   get_field_by_index_impl(ciInstanceKlass* loading_klass,
   21.71                                       int field_index);
   21.72 -  ciMethod*  get_method_by_index_impl(ciInstanceKlass* loading_klass,
   21.73 -                                      int method_index, Bytecodes::Code bc);
   21.74 +  ciMethod*  get_method_by_index_impl(constantPoolHandle cpool,
   21.75 +                                      int method_index, Bytecodes::Code bc,
   21.76 +                                      ciInstanceKlass* loading_klass);
   21.77 +  ciMethod*  get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
   21.78 +                                                int index, Bytecodes::Code bc);
   21.79  
   21.80    // Helper methods
   21.81    bool       check_klass_accessibility(ciKlass* accessing_klass,
   21.82 @@ -292,39 +292,13 @@
   21.83  
   21.84  
   21.85    // Access to certain well known ciObjects.
   21.86 -  ciInstanceKlass* ArrayStoreException_klass() {
   21.87 -    return _ArrayStoreException;
   21.88 +#define WK_KLASS_FUNC(name, ignore_s, ignore_o) \
   21.89 +  ciInstanceKlass* name() { \
   21.90 +    return _##name;\
   21.91    }
   21.92 -  ciInstanceKlass* Class_klass() {
   21.93 -    return _Class;
   21.94 -  }
   21.95 -  ciInstanceKlass* ClassCastException_klass() {
   21.96 -    return _ClassCastException;
   21.97 -  }
   21.98 -  ciInstanceKlass* Object_klass() {
   21.99 -    return _Object;
  21.100 -  }
  21.101 -  ciInstanceKlass* Throwable_klass() {
  21.102 -    return _Throwable;
  21.103 -  }
  21.104 -  ciInstanceKlass* Thread_klass() {
  21.105 -    return _Thread;
  21.106 -  }
  21.107 -  ciInstanceKlass* OutOfMemoryError_klass() {
  21.108 -    return _OutOfMemoryError;
  21.109 -  }
  21.110 -  ciInstanceKlass* String_klass() {
  21.111 -    return _String;
  21.112 -  }
  21.113 -  ciInstanceKlass* StringBuilder_klass() {
  21.114 -    return _StringBuilder;
  21.115 -  }
  21.116 -  ciInstanceKlass* StringBuffer_klass() {
  21.117 -    return _StringBuffer;
  21.118 -  }
  21.119 -  ciInstanceKlass* Integer_klass() {
  21.120 -    return _Integer;
  21.121 -  }
  21.122 +  WK_KLASSES_DO(WK_KLASS_FUNC)
  21.123 +#undef WK_KLASS_FUNC
  21.124 +
  21.125    ciInstance* NullPointerException_instance() {
  21.126      assert(_NullPointerException_instance != NULL, "initialization problem");
  21.127      return _NullPointerException_instance;

    22.1 --- a/src/share/vm/ci/ciExceptionHandler.cpp	Wed Dec 23 03:12:16 2009 -0800
    22.2 +++ b/src/share/vm/ci/ciExceptionHandler.cpp	Wed Jan 06 22:21:39 2010 -0800
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
    22.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -34,12 +34,16 @@
   22.11  //
   22.12  // Get the exception klass that this handler catches.
   22.13  ciInstanceKlass* ciExceptionHandler::catch_klass() {
   22.14 +  VM_ENTRY_MARK;
   22.15    assert(!is_catch_all(), "bad index");
   22.16    if (_catch_klass == NULL) {
   22.17      bool will_link;
   22.18 -    ciKlass* k = CURRENT_ENV->get_klass_by_index(_loading_klass,
   22.19 +    assert(_loading_klass->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
   22.20 +    constantPoolHandle cpool(_loading_klass->get_instanceKlass()->constants());
   22.21 +    ciKlass* k = CURRENT_ENV->get_klass_by_index(cpool,
   22.22                                                   _catch_klass_index,
   22.23 -                                                 will_link);
   22.24 +                                                 will_link,
   22.25 +                                                 _loading_klass);
   22.26      if (!will_link && k->is_loaded()) {
   22.27        GUARDED_VM_ENTRY(
   22.28          k = CURRENT_ENV->get_unloaded_klass(_loading_klass, k->name());

    23.1 --- a/src/share/vm/ci/ciField.cpp	Wed Dec 23 03:12:16 2009 -0800
    23.2 +++ b/src/share/vm/ci/ciField.cpp	Wed Jan 06 22:21:39 2010 -0800
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
    23.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -86,7 +86,7 @@
   23.11      bool ignore;
   23.12      // This is not really a class reference; the index always refers to the
   23.13      // field's type signature, as a symbol.  Linkage checks do not apply.
   23.14 -    _type = ciEnv::current(thread)->get_klass_by_index(klass, sig_index, ignore);
   23.15 +    _type = ciEnv::current(thread)->get_klass_by_index(cpool, sig_index, ignore, klass);
   23.16    } else {
   23.17      _type = ciType::make(field_type);
   23.18    }
   23.19 @@ -100,9 +100,9 @@
   23.20    int holder_index = cpool->klass_ref_index_at(index);
   23.21    bool holder_is_accessible;
   23.22    ciInstanceKlass* declared_holder =
   23.23 -    ciEnv::current(thread)->get_klass_by_index(klass, holder_index,
   23.24 -                                               holder_is_accessible)
   23.25 -      ->as_instance_klass();
   23.26 +    ciEnv::current(thread)->get_klass_by_index(cpool, holder_index,
   23.27 +                                               holder_is_accessible,
   23.28 +                                               klass)->as_instance_klass();
   23.29  
   23.30    // The declared holder of this field may not have been loaded.
   23.31    // Bail out with partial field information.
   23.32 @@ -168,8 +168,18 @@
   23.33    _holder = CURRENT_ENV->get_object(fd->field_holder())->as_instance_klass();
   23.34  
   23.35    // Check to see if the field is constant.
   23.36 -  if (_holder->is_initialized() &&
   23.37 -      this->is_final() && this->is_static()) {
   23.38 +  if (_holder->is_initialized() && this->is_final()) {
   23.39 +    if (!this->is_static()) {
   23.40 +      // A field can be constant if it's a final static field or if it's
   23.41 +      // a final non-static field of a trusted class ({java,sun}.dyn).
   23.42 +      if (_holder->is_in_package("java/dyn") || _holder->is_in_package("sun/dyn")) {
   23.43 +        _is_constant = true;
   23.44 +        return;
   23.45 +      }
   23.46 +      _is_constant = false;
   23.47 +      return;
   23.48 +    }
   23.49 +
   23.50      // This field just may be constant.  The only cases where it will
   23.51      // not be constant are:
   23.52      //
   23.53 @@ -182,8 +192,8 @@
   23.54      //    java.lang.System.out, and java.lang.System.err.
   23.55  
   23.56      klassOop k = _holder->get_klassOop();
   23.57 -    assert( SystemDictionary::system_klass() != NULL, "Check once per vm");
   23.58 -    if( k == SystemDictionary::system_klass() ) {
   23.59 +    assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
   23.60 +    if( k == SystemDictionary::System_klass() ) {
   23.61        // Check offsets for case 2: System.in, System.out, or System.err
   23.62        if( _offset == java_lang_System::in_offset_in_bytes()  ||
   23.63            _offset == java_lang_System::out_offset_in_bytes() ||

    24.1 --- a/src/share/vm/ci/ciField.hpp	Wed Dec 23 03:12:16 2009 -0800
    24.2 +++ b/src/share/vm/ci/ciField.hpp	Wed Jan 06 22:21:39 2010 -0800
    24.3 @@ -138,10 +138,18 @@
    24.4  
    24.5    // Get the constant value of this field.
    24.6    ciConstant constant_value() {
    24.7 -    assert(is_constant(), "illegal call to constant_value()");
    24.8 +    assert(is_static() && is_constant(), "illegal call to constant_value()");
    24.9      return _constant_value;
   24.10    }
   24.11  
   24.12 +  // Get the constant value of non-static final field in the given
   24.13 +  // object.
   24.14 +  ciConstant constant_value_of(ciObject* object) {
   24.15 +    assert(!is_static() && is_constant(), "only if field is non-static constant");
   24.16 +    assert(object->is_instance(), "must be instance");
   24.17 +    return object->as_instance()->field_value(this);
   24.18 +  }
   24.19 +
   24.20    // Check for link time errors.  Accessing a field from a
   24.21    // certain class via a certain bytecode may or may not be legal.
   24.22    // This call checks to see if an exception may be raised by

    25.1 --- a/src/share/vm/ci/ciInstance.cpp	Wed Dec 23 03:12:16 2009 -0800
    25.2 +++ b/src/share/vm/ci/ciInstance.cpp	Wed Jan 06 22:21:39 2010 -0800
    25.3 @@ -36,7 +36,7 @@
    25.4    VM_ENTRY_MARK;
    25.5    oop m = get_oop();
    25.6    // Return NULL if it is not java.lang.Class.
    25.7 -  if (m == NULL || m->klass() != SystemDictionary::class_klass()) {
    25.8 +  if (m == NULL || m->klass() != SystemDictionary::Class_klass()) {
    25.9      return NULL;
   25.10    }
   25.11    // Return either a primitive type or a klass.

    26.1 --- a/src/share/vm/ci/ciInstanceKlass.cpp	Wed Dec 23 03:12:16 2009 -0800
    26.2 +++ b/src/share/vm/ci/ciInstanceKlass.cpp	Wed Jan 06 22:21:39 2010 -0800
    26.3 @@ -75,7 +75,7 @@
    26.4    _java_mirror = NULL;
    26.5  
    26.6    if (is_shared()) {
    26.7 -    if (h_k() != SystemDictionary::object_klass()) {
    26.8 +    if (h_k() != SystemDictionary::Object_klass()) {
    26.9        super();
   26.10      }
   26.11      java_mirror();
   26.12 @@ -232,8 +232,48 @@
   26.13  // ------------------------------------------------------------------
   26.14  // ciInstanceKlass::uses_default_loader
   26.15  bool ciInstanceKlass::uses_default_loader() {
   26.16 -  VM_ENTRY_MARK;
   26.17 -  return loader() == NULL;
   26.18 +  // Note:  We do not need to resolve the handle or enter the VM
   26.19 +  // in order to test null-ness.
   26.20 +  return _loader == NULL;
   26.21 +}
   26.22 +
   26.23 +// ------------------------------------------------------------------
   26.24 +// ciInstanceKlass::is_in_package
   26.25 +//
   26.26 +// Is this klass in the given package?
   26.27 +bool ciInstanceKlass::is_in_package(const char* packagename, int len) {
   26.28 +  // To avoid class loader mischief, this test always rejects application classes.
   26.29 +  if (!uses_default_loader())
   26.30 +    return false;
   26.31 +  GUARDED_VM_ENTRY(
   26.32 +    return is_in_package_impl(packagename, len);
   26.33 +  )
   26.34 +}
   26.35 +
   26.36 +bool ciInstanceKlass::is_in_package_impl(const char* packagename, int len) {
   26.37 +  ASSERT_IN_VM;
   26.38 +
   26.39 +  // If packagename contains trailing '/' exclude it from the
   26.40 +  // prefix-test since we test for it explicitly.
   26.41 +  if (packagename[len - 1] == '/')
   26.42 +    len--;
   26.43 +
   26.44 +  if (!name()->starts_with(packagename, len))
   26.45 +    return false;
   26.46 +
   26.47 +  // Test if the class name is something like "java/lang".
   26.48 +  if ((len + 1) > name()->utf8_length())
   26.49 +    return false;
   26.50 +
   26.51 +  // Test for trailing '/'
   26.52 +  if ((char) name()->byte_at(len) != '/')
   26.53 +    return false;
   26.54 +
   26.55 +  // Make sure it's not actually in a subpackage:
   26.56 +  if (name()->index_of_at(len+1, "/", 1) >= 0)
   26.57 +    return false;
   26.58 +
   26.59 +  return true;
   26.60  }
   26.61  
   26.62  // ------------------------------------------------------------------

    27.1 --- a/src/share/vm/ci/ciInstanceKlass.hpp	Wed Dec 23 03:12:16 2009 -0800
    27.2 +++ b/src/share/vm/ci/ciInstanceKlass.hpp	Wed Jan 06 22:21:39 2010 -0800
    27.3 @@ -29,10 +29,11 @@
    27.4  // be loaded.
    27.5  class ciInstanceKlass : public ciKlass {
    27.6    CI_PACKAGE_ACCESS
    27.7 +  friend class ciBytecodeStream;
    27.8    friend class ciEnv;
    27.9 +  friend class ciExceptionHandler;
   27.10    friend class ciMethod;
   27.11    friend class ciField;
   27.12 -  friend class ciBytecodeStream;
   27.13  
   27.14  private:
   27.15    jobject                _loader;
   27.16 @@ -78,6 +79,8 @@
   27.17  
   27.18    const char* type_string() { return "ciInstanceKlass"; }
   27.19  
   27.20 +  bool is_in_package_impl(const char* packagename, int len);
   27.21 +
   27.22    void print_impl(outputStream* st);
   27.23  
   27.24    ciConstantPoolCache* field_cache();
   27.25 @@ -196,6 +199,12 @@
   27.26  
   27.27    bool is_java_lang_Object();
   27.28  
   27.29 +  // Is this klass in the given package?
   27.30 +  bool is_in_package(const char* packagename) {
   27.31 +    return is_in_package(packagename, (int) strlen(packagename));
   27.32 +  }
   27.33 +  bool is_in_package(const char* packagename, int len);
   27.34 +
   27.35    // What kind of ciObject is this?
   27.36    bool is_instance_klass() { return true; }
   27.37    bool is_java_klass()     { return true; }

    28.1 --- a/src/share/vm/ci/ciKlass.cpp	Wed Dec 23 03:12:16 2009 -0800
    28.2 +++ b/src/share/vm/ci/ciKlass.cpp	Wed Jan 06 22:21:39 2010 -0800
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
    28.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it

    29.1 --- a/src/share/vm/ci/ciKlass.hpp	Wed Dec 23 03:12:16 2009 -0800
    29.2 +++ b/src/share/vm/ci/ciKlass.hpp	Wed Jan 06 22:21:39 2010 -0800
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
    29.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -69,7 +69,7 @@
   29.11    ciKlass(KlassHandle k_h);
   29.12  
   29.13    // What is the name of this klass?
   29.14 -  ciSymbol* name() { return _name; }
   29.15 +  ciSymbol* name() const { return _name; }
   29.16  
   29.17    // What is its layout helper value?
   29.18    jint layout_helper() { return _layout_helper; }

    30.1 --- a/src/share/vm/ci/ciMethod.cpp	Wed Dec 23 03:12:16 2009 -0800
    30.2 +++ b/src/share/vm/ci/ciMethod.cpp	Wed Jan 06 22:21:39 2010 -0800
    30.3 @@ -687,7 +687,7 @@
    30.4  // ------------------------------------------------------------------
    30.5  // invokedynamic support
    30.6  //
    30.7 -bool ciMethod::is_method_handle_invoke() {
    30.8 +bool ciMethod::is_method_handle_invoke() const {
    30.9    check_is_loaded();
   30.10    bool flag = ((flags().as_int() & JVM_MH_INVOKE_BITS) == JVM_MH_INVOKE_BITS);
   30.11  #ifdef ASSERT

    31.1 --- a/src/share/vm/ci/ciMethod.hpp	Wed Dec 23 03:12:16 2009 -0800
    31.2 +++ b/src/share/vm/ci/ciMethod.hpp	Wed Jan 06 22:21:39 2010 -0800
    31.3 @@ -38,6 +38,8 @@
    31.4    CI_PACKAGE_ACCESS
    31.5    friend class ciEnv;
    31.6    friend class ciExceptionHandlerStream;
    31.7 +  friend class ciBytecodeStream;
    31.8 +  friend class ciMethodHandle;
    31.9  
   31.10   private:
   31.11    // General method information.
   31.12 @@ -213,7 +215,7 @@
   31.13    bool check_call(int refinfo_index, bool is_static) const;
   31.14    void build_method_data();  // make sure it exists in the VM also
   31.15    int scale_count(int count, float prof_factor = 1.);  // make MDO count commensurate with IIC
   31.16 -  bool is_method_handle_invoke();
   31.17 +  bool is_method_handle_invoke() const;
   31.18    ciInstance* method_handle_type();
   31.19  
   31.20    // What kind of ciObject is this?
   31.21 @@ -251,4 +253,10 @@
   31.22    // Print the name of this method in various incarnations.
   31.23    void print_name(outputStream* st = tty);
   31.24    void print_short_name(outputStream* st = tty);
   31.25 +
   31.26 +  methodOop get_method_handle_target() {
   31.27 +    klassOop receiver_limit_oop = NULL;
   31.28 +    int flags = 0;
   31.29 +    return MethodHandles::decode_method(get_oop(), receiver_limit_oop, flags);
   31.30 +  }
   31.31  };

    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/src/share/vm/ci/ciMethodHandle.cpp	Wed Jan 06 22:21:39 2010 -0800
    32.3 @@ -0,0 +1,52 @@
    32.4 +/*
    32.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    32.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.7 + *
    32.8 + * This code is free software; you can redistribute it and/or modify it
    32.9 + * under the terms of the GNU General Public License version 2 only, as
   32.10 + * published by the Free Software Foundation.
   32.11 + *
   32.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   32.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   32.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   32.15 + * version 2 for more details (a copy is included in the LICENSE file that
   32.16 + * accompanied this code).
   32.17 + *
   32.18 + * You should have received a copy of the GNU General Public License version
   32.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   32.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   32.21 + *
   32.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   32.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   32.24 + * have any questions.
   32.25 + *
   32.26 + */
   32.27 +
   32.28 +#include "incls/_precompiled.incl"
   32.29 +#include "incls/_ciMethodHandle.cpp.incl"
   32.30 +
   32.31 +// ciMethodHandle
   32.32 +
   32.33 +// ------------------------------------------------------------------
   32.34 +// ciMethodHandle::get_adapter
   32.35 +//
   32.36 +// Return an adapter for this MethodHandle.
   32.37 +ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) const {
   32.38 +  VM_ENTRY_MARK;
   32.39 +
   32.40 +  Handle h(get_oop());
   32.41 +  methodHandle callee(_callee->get_methodOop());
   32.42 +  MethodHandleCompiler mhc(h, callee, is_invokedynamic, THREAD);
   32.43 +  methodHandle m = mhc.compile(CHECK_NULL);
   32.44 +  return CURRENT_ENV->get_object(m())->as_method();
   32.45 +}
   32.46 +
   32.47 +
   32.48 +// ------------------------------------------------------------------
   32.49 +// ciMethodHandle::print_impl
   32.50 +//
   32.51 +// Implementation of the print method.
   32.52 +void ciMethodHandle::print_impl(outputStream* st) {
   32.53 +  st->print(" type=");
   32.54 +  get_oop()->print();
   32.55 +}

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/src/share/vm/ci/ciMethodHandle.hpp	Wed Jan 06 22:21:39 2010 -0800
    33.3 @@ -0,0 +1,56 @@
    33.4 +/*
    33.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 + *
    33.8 + * This code is free software; you can redistribute it and/or modify it
    33.9 + * under the terms of the GNU General Public License version 2 only, as
   33.10 + * published by the Free Software Foundation.
   33.11 + *
   33.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   33.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.15 + * version 2 for more details (a copy is included in the LICENSE file that
   33.16 + * accompanied this code).
   33.17 + *
   33.18 + * You should have received a copy of the GNU General Public License version
   33.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   33.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.21 + *
   33.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   33.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
   33.24 + * have any questions.
   33.25 + *
   33.26 + */
   33.27 +
   33.28 +// ciMethodHandle
   33.29 +//
   33.30 +// The class represents a java.dyn.MethodHandle object.
   33.31 +class ciMethodHandle : public ciInstance {
   33.32 +private:
   33.33 +  ciMethod* _callee;
   33.34 +
   33.35 +  // Return an adapter for this MethodHandle.
   33.36 +  ciMethod* get_adapter(bool is_invokedynamic) const;
   33.37 +
   33.38 +protected:
   33.39 +  void print_impl(outputStream* st);
   33.40 +
   33.41 +public:
   33.42 +  ciMethodHandle(instanceHandle h_i) : ciInstance(h_i) {};
   33.43 +
   33.44 +  // What kind of ciObject is this?
   33.45 +  bool is_method_handle() const { return true; }
   33.46 +
   33.47 +  ciMethod* callee() const { return _callee; }
   33.48 +  void  set_callee(ciMethod* m) { _callee = m; }
   33.49 +
   33.50 +  // Return an adapter for a MethodHandle call.
   33.51 +  ciMethod* get_method_handle_adapter() const {
   33.52 +    return get_adapter(false);
   33.53 +  }
   33.54 +
   33.55 +  // Return an adapter for an invokedynamic call.
   33.56 +  ciMethod* get_invokedynamic_adapter() const {
   33.57 +    return get_adapter(true);
   33.58 +  }
   33.59 +};

    34.1 --- a/src/share/vm/ci/ciObject.hpp	Wed Dec 23 03:12:16 2009 -0800
    34.2 +++ b/src/share/vm/ci/ciObject.hpp	Wed Jan 06 22:21:39 2010 -0800
    34.3 @@ -131,9 +131,12 @@
    34.4  
    34.5    // What kind of ciObject is this?
    34.6    virtual bool is_null_object() const       { return false; }
    34.7 +  virtual bool is_call_site() const         { return false; }
    34.8 +  virtual bool is_cpcache() const           { return false; }
    34.9    virtual bool is_instance()                { return false; }
   34.10    virtual bool is_method()                  { return false; }
   34.11    virtual bool is_method_data()             { return false; }
   34.12 +  virtual bool is_method_handle() const     { return false; }
   34.13    virtual bool is_array()                   { return false; }
   34.14    virtual bool is_obj_array()               { return false; }
   34.15    virtual bool is_type_array()              { return false; }
   34.16 @@ -185,6 +188,14 @@
   34.17      assert(is_null_object(), "bad cast");
   34.18      return (ciNullObject*)this;
   34.19    }
   34.20 +  ciCallSite*              as_call_site() {
   34.21 +    assert(is_call_site(), "bad cast");
   34.22 +    return (ciCallSite*) this;
   34.23 +  }
   34.24 +  ciCPCache*               as_cpcache() {
   34.25 +    assert(is_cpcache(), "bad cast");
   34.26 +    return (ciCPCache*) this;
   34.27 +  }
   34.28    ciInstance*              as_instance() {
   34.29      assert(is_instance(), "bad cast");
   34.30      return (ciInstance*)this;
   34.31 @@ -197,6 +208,10 @@
   34.32      assert(is_method_data(), "bad cast");
   34.33      return (ciMethodData*)this;
   34.34    }
   34.35 +  ciMethodHandle*          as_method_handle() {
   34.36 +    assert(is_method_handle(), "bad cast");
   34.37 +    return (ciMethodHandle*) this;
   34.38 +  }
   34.39    ciArray*                 as_array() {
   34.40      assert(is_array(), "bad cast");
   34.41      return (ciArray*)this;

    35.1 --- a/src/share/vm/ci/ciObjectFactory.cpp	Wed Dec 23 03:12:16 2009 -0800
    35.2 +++ b/src/share/vm/ci/ciObjectFactory.cpp	Wed Jan 06 22:21:39 2010 -0800
    35.3 @@ -144,39 +144,13 @@
    35.4    ciEnv::_obj_array_klass_klass_instance =
    35.5      get(Universe::objArrayKlassKlassObj())
    35.6        ->as_obj_array_klass_klass();
    35.7 -  ciEnv::_ArrayStoreException =
    35.8 -    get(SystemDictionary::ArrayStoreException_klass())
    35.9 -      ->as_instance_klass();
   35.10 -  ciEnv::_Class =
   35.11 -    get(SystemDictionary::class_klass())
   35.12 -      ->as_instance_klass();
   35.13 -  ciEnv::_ClassCastException =
   35.14 -    get(SystemDictionary::ClassCastException_klass())
   35.15 -      ->as_instance_klass();
   35.16 -  ciEnv::_Object =
   35.17 -    get(SystemDictionary::object_klass())
   35.18 -      ->as_instance_klass();
   35.19 -  ciEnv::_Throwable =
   35.20 -    get(SystemDictionary::throwable_klass())
   35.21 -      ->as_instance_klass();
   35.22 -  ciEnv::_Thread =
   35.23 -    get(SystemDictionary::thread_klass())
   35.24 -      ->as_instance_klass();
   35.25 -  ciEnv::_OutOfMemoryError =
   35.26 -    get(SystemDictionary::OutOfMemoryError_klass())
   35.27 -      ->as_instance_klass();
   35.28 -  ciEnv::_String =
   35.29 -    get(SystemDictionary::string_klass())
   35.30 -      ->as_instance_klass();
   35.31 -  ciEnv::_StringBuffer =
   35.32 -    get(SystemDictionary::stringBuffer_klass())
   35.33 -      ->as_instance_klass();
   35.34 -  ciEnv::_StringBuilder =
   35.35 -    get(SystemDictionary::StringBuilder_klass())
   35.36 -      ->as_instance_klass();
   35.37 -  ciEnv::_Integer =
   35.38 -    get(SystemDictionary::int_klass())
   35.39 -      ->as_instance_klass();
   35.40 +
   35.41 +#define WK_KLASS_DEFN(name, ignore_s, opt)                              \
   35.42 +  if (SystemDictionary::name() != NULL) \
   35.43 +    ciEnv::_##name = get(SystemDictionary::name())->as_instance_klass();
   35.44 +
   35.45 +  WK_KLASSES_DO(WK_KLASS_DEFN)
   35.46 +#undef WK_KLASS_DEFN
   35.47  
   35.48    for (int len = -1; len != _ci_objects->length(); ) {
   35.49      len = _ci_objects->length();
   35.50 @@ -333,13 +307,21 @@
   35.51      return new (arena()) ciMethodData(h_md);
   35.52    } else if (o->is_instance()) {
   35.53      instanceHandle h_i(THREAD, (instanceOop)o);
   35.54 -    return new (arena()) ciInstance(h_i);
   35.55 +    if (java_dyn_CallSite::is_instance(o))
   35.56 +      return new (arena()) ciCallSite(h_i);
   35.57 +    else if (java_dyn_MethodHandle::is_instance(o))
   35.58 +      return new (arena()) ciMethodHandle(h_i);
   35.59 +    else
   35.60 +      return new (arena()) ciInstance(h_i);
   35.61    } else if (o->is_objArray()) {
   35.62      objArrayHandle h_oa(THREAD, (objArrayOop)o);
   35.63      return new (arena()) ciObjArray(h_oa);
   35.64    } else if (o->is_typeArray()) {
   35.65      typeArrayHandle h_ta(THREAD, (typeArrayOop)o);
   35.66      return new (arena()) ciTypeArray(h_ta);
   35.67 +  } else if (o->is_constantPoolCache()) {
   35.68 +    constantPoolCacheHandle h_cpc(THREAD, (constantPoolCacheOop) o);
   35.69 +    return new (arena()) ciCPCache(h_cpc);
   35.70    }
   35.71  
   35.72    // The oop is of some type not supported by the compiler interface.
   35.73 @@ -576,7 +558,7 @@
   35.74    if (key->is_perm() && _non_perm_count == 0) {
   35.75      return emptyBucket;
   35.76    } else if (key->is_instance()) {
   35.77 -    if (key->klass() == SystemDictionary::class_klass()) {
   35.78 +    if (key->klass() == SystemDictionary::Class_klass()) {
   35.79        // class mirror instances are always perm
   35.80        return emptyBucket;
   35.81      }

    36.1 --- a/src/share/vm/ci/ciStreams.cpp	Wed Dec 23 03:12:16 2009 -0800
    36.2 +++ b/src/share/vm/ci/ciStreams.cpp	Wed Jan 06 22:21:39 2010 -0800
    36.3 @@ -186,8 +186,9 @@
    36.4  // If this bytecode is a new, newarray, multianewarray, instanceof,
    36.5  // or checkcast, get the referenced klass.
    36.6  ciKlass* ciBytecodeStream::get_klass(bool& will_link) {
    36.7 -  return CURRENT_ENV->get_klass_by_index(_holder, get_klass_index(),
    36.8 -                                         will_link);
    36.9 +  VM_ENTRY_MARK;
   36.10 +  constantPoolHandle cpool(_method->get_methodOop()->constants());
   36.11 +  return CURRENT_ENV->get_klass_by_index(cpool, get_klass_index(), will_link, _holder);
   36.12  }
   36.13  
   36.14  // ------------------------------------------------------------------
   36.15 @@ -213,7 +214,9 @@
   36.16  // If this bytecode is one of the ldc variants, get the referenced
   36.17  // constant.
   36.18  ciConstant ciBytecodeStream::get_constant() {
   36.19 -  return CURRENT_ENV->get_constant_by_index(_holder, get_constant_index());
   36.20 +  VM_ENTRY_MARK;
   36.21 +  constantPoolHandle cpool(_method->get_methodOop()->constants());
   36.22 +  return CURRENT_ENV->get_constant_by_index(cpool, get_constant_index(), _holder);
   36.23  }
   36.24  
   36.25  // ------------------------------------------------------------------
   36.26 @@ -264,9 +267,11 @@
   36.27  // There is no "will_link" result passed back.  The user is responsible
   36.28  // for checking linkability when retrieving the associated field.
   36.29  ciInstanceKlass* ciBytecodeStream::get_declared_field_holder() {
   36.30 +  VM_ENTRY_MARK;
   36.31 +  constantPoolHandle cpool(_method->get_methodOop()->constants());
   36.32    int holder_index = get_field_holder_index();
   36.33    bool ignore;
   36.34 -  return CURRENT_ENV->get_klass_by_index(_holder, holder_index, ignore)
   36.35 +  return CURRENT_ENV->get_klass_by_index(cpool, holder_index, ignore, _holder)
   36.36        ->as_instance_klass();
   36.37  }
   36.38  
   36.39 @@ -277,9 +282,10 @@
   36.40  // referenced by the current bytecode.  Used for generating
   36.41  // deoptimization information.
   36.42  int ciBytecodeStream::get_field_holder_index() {
   36.43 -  VM_ENTRY_MARK;
   36.44 -  constantPoolOop cpool = _holder->get_instanceKlass()->constants();
   36.45 -  return cpool->klass_ref_index_at(get_field_index());
   36.46 +  GUARDED_VM_ENTRY(
   36.47 +    constantPoolOop cpool = _holder->get_instanceKlass()->constants();
   36.48 +    return cpool->klass_ref_index_at(get_field_index());
   36.49 +  )
   36.50  }
   36.51  
   36.52  // ------------------------------------------------------------------
   36.53 @@ -321,7 +327,9 @@
   36.54  //
   36.55  // If this is a method invocation bytecode, get the invoked method.
   36.56  ciMethod* ciBytecodeStream::get_method(bool& will_link) {
   36.57 -  ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(),cur_bc());
   36.58 +  VM_ENTRY_MARK;
   36.59 +  constantPoolHandle cpool(_method->get_methodOop()->constants());
   36.60 +  ciMethod* m = CURRENT_ENV->get_method_by_index(cpool, get_method_index(), cur_bc(), _holder);
   36.61    will_link = m->is_loaded();
   36.62    return m;
   36.63  }
   36.64 @@ -338,11 +346,13 @@
   36.65  // There is no "will_link" result passed back.  The user is responsible
   36.66  // for checking linkability when retrieving the associated method.
   36.67  ciKlass* ciBytecodeStream::get_declared_method_holder() {
   36.68 +  VM_ENTRY_MARK;
   36.69 +  constantPoolHandle cpool(_method->get_methodOop()->constants());
   36.70    bool ignore;
   36.71 -  // report as Dynamic for invokedynamic, which is syntactically classless
   36.72 +  // report as InvokeDynamic for invokedynamic, which is syntactically classless
   36.73    if (cur_bc() == Bytecodes::_invokedynamic)
   36.74 -    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_Dynamic(), false);
   36.75 -  return CURRENT_ENV->get_klass_by_index(_holder, get_method_holder_index(), ignore);
   36.76 +    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_InvokeDynamic(), false);
   36.77 +  return CURRENT_ENV->get_klass_by_index(cpool, get_method_holder_index(), ignore, _holder);
   36.78  }
   36.79  
   36.80  // ------------------------------------------------------------------
   36.81 @@ -352,8 +362,7 @@
   36.82  // referenced by the current bytecode.  Used for generating
   36.83  // deoptimization information.
   36.84  int ciBytecodeStream::get_method_holder_index() {
   36.85 -  VM_ENTRY_MARK;
   36.86 -  constantPoolOop cpool = _holder->get_instanceKlass()->constants();
   36.87 +  constantPoolOop cpool = _method->get_methodOop()->constants();
   36.88    return cpool->klass_ref_index_at(get_method_index());
   36.89  }
   36.90  
   36.91 @@ -370,3 +379,31 @@
   36.92    int name_and_type_index = cpool->name_and_type_ref_index_at(method_index);
   36.93    return cpool->signature_ref_index_at(name_and_type_index);
   36.94  }
   36.95 +
   36.96 +// ------------------------------------------------------------------
   36.97 +// ciBytecodeStream::get_cpcache
   36.98 +ciCPCache* ciBytecodeStream::get_cpcache() {
   36.99 +  VM_ENTRY_MARK;
  36.100 +  // Get the constant pool.
  36.101 +  constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
  36.102 +  constantPoolCacheOop cpcache = cpool->cache();
  36.103 +
  36.104 +  return CURRENT_ENV->get_object(cpcache)->as_cpcache();
  36.105 +}
  36.106 +
  36.107 +// ------------------------------------------------------------------
  36.108 +// ciBytecodeStream::get_call_site
  36.109 +ciCallSite* ciBytecodeStream::get_call_site() {
  36.110 +  VM_ENTRY_MARK;
  36.111 +  // Get the constant pool.
  36.112 +  constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
  36.113 +  constantPoolCacheOop cpcache = cpool->cache();
  36.114 +
  36.115 +  // Get the CallSite from the constant pool cache.
  36.116 +  int method_index = get_method_index();
  36.117 +  ConstantPoolCacheEntry* cpcache_entry = cpcache->secondary_entry_at(method_index);
  36.118 +  oop call_site_oop = cpcache_entry->f1();
  36.119 +
  36.120 +  // Create a CallSite object and return it.
  36.121 +  return CURRENT_ENV->get_object(call_site_oop)->as_call_site();
  36.122 +}

    37.1 --- a/src/share/vm/ci/ciStreams.hpp	Wed Dec 23 03:12:16 2009 -0800
    37.2 +++ b/src/share/vm/ci/ciStreams.hpp	Wed Jan 06 22:21:39 2010 -0800
    37.3 @@ -232,6 +232,9 @@
    37.4    int       get_method_holder_index();
    37.5    int       get_method_signature_index();
    37.6  
    37.7 +  ciCPCache*  get_cpcache();
    37.8 +  ciCallSite* get_call_site();
    37.9 +
   37.10   private:
   37.11    void assert_index_size(int required_size) const {
   37.12  #ifdef ASSERT

    38.1 --- a/src/share/vm/ci/ciSymbol.cpp	Wed Dec 23 03:12:16 2009 -0800
    38.2 +++ b/src/share/vm/ci/ciSymbol.cpp	Wed Jan 06 22:21:39 2010 -0800
    38.3 @@ -1,5 +1,5 @@
    38.4  /*
    38.5 - * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
    38.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    38.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.8   *
    38.9   * This code is free software; you can redistribute it and/or modify it
   38.10 @@ -60,6 +60,22 @@
   38.11  }
   38.12  
   38.13  // ------------------------------------------------------------------
   38.14 +// ciSymbol::starts_with
   38.15 +//
   38.16 +// Tests if the symbol starts with the given prefix.
   38.17 +bool ciSymbol::starts_with(const char* prefix, int len) const {
   38.18 +  GUARDED_VM_ENTRY(return get_symbolOop()->starts_with(prefix, len);)
   38.19 +}
   38.20 +
   38.21 +// ------------------------------------------------------------------
   38.22 +// ciSymbol::index_of
   38.23 +//
   38.24 +// Determines where the symbol contains the given substring.
   38.25 +int ciSymbol::index_of_at(int i, const char* str, int len) const {
   38.26 +  GUARDED_VM_ENTRY(return get_symbolOop()->index_of_at(i, str, len);)
   38.27 +}
   38.28 +
   38.29 +// ------------------------------------------------------------------
   38.30  // ciSymbol::utf8_length
   38.31  int ciSymbol::utf8_length() {
   38.32    GUARDED_VM_ENTRY(return get_symbolOop()->utf8_length();)

    39.1 --- a/src/share/vm/ci/ciSymbol.hpp	Wed Dec 23 03:12:16 2009 -0800
    39.2 +++ b/src/share/vm/ci/ciSymbol.hpp	Wed Jan 06 22:21:39 2010 -0800
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
    39.6 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -28,6 +28,7 @@
   39.11  // machine.
   39.12  class ciSymbol : public ciObject {
   39.13    CI_PACKAGE_ACCESS
   39.14 +  // These friends all make direct use of get_symbolOop:
   39.15    friend class ciEnv;
   39.16    friend class ciInstanceKlass;
   39.17    friend class ciSignature;
   39.18 @@ -38,13 +39,13 @@
   39.19    ciSymbol(symbolOop s) : ciObject(s) {}
   39.20    ciSymbol(symbolHandle s);   // for use with vmSymbolHandles
   39.21  
   39.22 -  symbolOop get_symbolOop() { return (symbolOop)get_oop(); }
   39.23 +  symbolOop get_symbolOop() const { return (symbolOop)get_oop(); }
   39.24  
   39.25    const char* type_string() { return "ciSymbol"; }
   39.26  
   39.27    void print_impl(outputStream* st);
   39.28  
   39.29 -  int         byte_at(int i);
   39.30 +  // This is public in symbolOop but private here, because the base can move:
   39.31    jbyte*      base();
   39.32  
   39.33    // Make a ciSymbol from a C string (implementation).
   39.34 @@ -55,6 +56,15 @@
   39.35    const char* as_utf8();
   39.36    int         utf8_length();
   39.37  
   39.38 +  // Return the i-th utf8 byte, where i < utf8_length
   39.39 +  int         byte_at(int i);
   39.40 +
   39.41 +  // Tests if the symbol starts with the given prefix.
   39.42 +  bool starts_with(const char* prefix, int len) const;
   39.43 +
   39.44 +  // Determines where the symbol contains the given substring.
   39.45 +  int index_of_at(int i, const char* str, int len) const;
   39.46 +
   39.47    // What kind of ciObject is this?
   39.48    bool is_symbol() { return true; }
   39.49  

    40.1 --- a/src/share/vm/ci/ciType.cpp	Wed Dec 23 03:12:16 2009 -0800
    40.2 +++ b/src/share/vm/ci/ciType.cpp	Wed Jan 06 22:21:39 2010 -0800
    40.3 @@ -111,7 +111,7 @@
    40.4    // short, etc.
    40.5    // Note: Bare T_ADDRESS means a raw pointer type, not a return_address.
    40.6    assert((uint)t < T_CONFLICT+1, "range check");
    40.7 -  if (t == T_OBJECT)  return ciEnv::_Object;  // java/lang/Object
    40.8 +  if (t == T_OBJECT)  return ciEnv::_Object_klass;  // java/lang/Object
    40.9    assert(_basic_types[t] != NULL, "domain check");
   40.10    return _basic_types[t];
   40.11  }

    41.1 --- a/src/share/vm/ci/ciTypeFlow.cpp	Wed Dec 23 03:12:16 2009 -0800
    41.2 +++ b/src/share/vm/ci/ciTypeFlow.cpp	Wed Jan 06 22:21:39 2010 -0800
    41.3 @@ -635,8 +635,15 @@
    41.4    ciMethod* method = str->get_method(will_link);
    41.5    if (!will_link) {
    41.6      // We weren't able to find the method.
    41.7 -    ciKlass* unloaded_holder = method->holder();
    41.8 -    trap(str, unloaded_holder, str->get_method_holder_index());
    41.9 +    if (str->cur_bc() == Bytecodes::_invokedynamic) {
   41.10 +      trap(str, NULL,
   41.11 +           Deoptimization::make_trap_request
   41.12 +           (Deoptimization::Reason_uninitialized,
   41.13 +            Deoptimization::Action_reinterpret));
   41.14 +    } else {
   41.15 +      ciKlass* unloaded_holder = method->holder();
   41.16 +      trap(str, unloaded_holder, str->get_method_holder_index());
   41.17 +    }
   41.18    } else {
   41.19      ciSignature* signature = method->signature();
   41.20      ciSignatureStream sigstr(signature);
   41.21 @@ -1292,8 +1299,8 @@
   41.22    case Bytecodes::_invokeinterface: do_invoke(str, true);           break;
   41.23    case Bytecodes::_invokespecial:   do_invoke(str, true);           break;
   41.24    case Bytecodes::_invokestatic:    do_invoke(str, false);          break;
   41.25 -
   41.26    case Bytecodes::_invokevirtual:   do_invoke(str, true);           break;
   41.27 +  case Bytecodes::_invokedynamic:   do_invoke(str, false);          break;
   41.28  
   41.29    case Bytecodes::_istore:   store_local_int(str->get_index());     break;
   41.30    case Bytecodes::_istore_0: store_local_int(0);                    break;

    42.1 --- a/src/share/vm/ci/ciUtilities.hpp	Wed Dec 23 03:12:16 2009 -0800
    42.2 +++ b/src/share/vm/ci/ciUtilities.hpp	Wed Jan 06 22:21:39 2010 -0800
    42.3 @@ -79,7 +79,7 @@
    42.4    THREAD);                                       \
    42.5    if (HAS_PENDING_EXCEPTION) {                   \
    42.6      if (PENDING_EXCEPTION->klass() ==            \
    42.7 -        SystemDictionary::threaddeath_klass()) { \
    42.8 +        SystemDictionary::ThreadDeath_klass()) { \
    42.9        /* Kill the compilation. */                \
   42.10        fatal("unhandled ci exception");           \
   42.11        return (result);                           \

    43.1 --- a/src/share/vm/classfile/classFileParser.cpp	Wed Dec 23 03:12:16 2009 -0800
    43.2 +++ b/src/share/vm/classfile/classFileParser.cpp	Wed Jan 06 22:21:39 2010 -0800
    43.3 @@ -430,7 +430,7 @@
    43.4    case JVM_CONSTANT_UnresolvedClass :
    43.5      // Patching a class means pre-resolving it.
    43.6      // The name in the constant pool is ignored.
    43.7 -    if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance
    43.8 +    if (patch->klass() == SystemDictionary::Class_klass()) { // %%% java_lang_Class::is_instance
    43.9        guarantee_property(!java_lang_Class::is_primitive(patch()),
   43.10                           "Illegal class patch at %d in class file %s",
   43.11                           index, CHECK);
   43.12 @@ -643,7 +643,7 @@
   43.13        guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK);
   43.14        break;
   43.15      case T_OBJECT:
   43.16 -      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;", 18)
   43.17 +      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
   43.18                           && (value_type.is_string() || value_type.is_unresolved_string())),
   43.19                           "Bad string initial value in class file %s", CHECK);
   43.20        break;
   43.21 @@ -1718,9 +1718,7 @@
   43.22    m->set_exception_table(exception_handlers());
   43.23  
   43.24    // Copy byte codes
   43.25 -  if (code_length > 0) {
   43.26 -    memcpy(m->code_base(), code_start, code_length);
   43.27 -  }
   43.28 +  m->set_code(code_start);
   43.29  
   43.30    // Copy line number table
   43.31    if (linenumber_table != NULL) {
   43.32 @@ -3471,8 +3469,8 @@
   43.33  #endif
   43.34  
   43.35    // Check if this klass supports the java.lang.Cloneable interface
   43.36 -  if (SystemDictionary::cloneable_klass_loaded()) {
   43.37 -    if (k->is_subtype_of(SystemDictionary::cloneable_klass())) {
   43.38 +  if (SystemDictionary::Cloneable_klass_loaded()) {
   43.39 +    if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) {
   43.40        k->set_is_cloneable();
   43.41      }
   43.42    }
   43.43 @@ -4178,7 +4176,7 @@
   43.44        // Check if ch is Java identifier start or is Java identifier part
   43.45        // 4672820: call java.lang.Character methods directly without generating separate tables.
   43.46        EXCEPTION_MARK;
   43.47 -      instanceKlassHandle klass (THREAD, SystemDictionary::char_klass());
   43.48 +      instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass());
   43.49  
   43.50        // return value
   43.51        JavaValue result(T_BOOLEAN);

    44.1 --- a/src/share/vm/classfile/classLoader.cpp	Wed Dec 23 03:12:16 2009 -0800
    44.2 +++ b/src/share/vm/classfile/classLoader.cpp	Wed Jan 06 22:21:39 2010 -0800
    44.3 @@ -819,7 +819,7 @@
    44.4      _package_hash_table->copy_pkgnames(packages);
    44.5    }
    44.6    // Allocate objArray and fill with java.lang.String
    44.7 -  objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
    44.8 +  objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
    44.9                                             nof_entries, CHECK_0);
   44.10    objArrayHandle result(THREAD, r);
   44.11    for (int i = 0; i < nof_entries; i++) {

    45.1 --- a/src/share/vm/classfile/javaAssertions.cpp	Wed Dec 23 03:12:16 2009 -0800
    45.2 +++ b/src/share/vm/classfile/javaAssertions.cpp	Wed Jan 06 22:21:39 2010 -0800
    45.3 @@ -95,14 +95,14 @@
    45.4    int len;
    45.5    typeArrayOop t;
    45.6    len = OptionList::count(_packages);
    45.7 -  objArrayOop pn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL);
    45.8 +  objArrayOop pn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL);
    45.9    objArrayHandle pkgNames (THREAD, pn);
   45.10    t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL);
   45.11    typeArrayHandle pkgEnabled(THREAD, t);
   45.12    fillJavaArrays(_packages, len, pkgNames, pkgEnabled, CHECK_NULL);
   45.13  
   45.14    len = OptionList::count(_classes);
   45.15 -  objArrayOop cn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL);
   45.16 +  objArrayOop cn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL);
   45.17    objArrayHandle classNames (THREAD, cn);
   45.18    t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL);
   45.19    typeArrayHandle classEnabled(THREAD, t);

    46.1 --- a/src/share/vm/classfile/javaClasses.cpp	Wed Dec 23 03:12:16 2009 -0800
    46.2 +++ b/src/share/vm/classfile/javaClasses.cpp	Wed Jan 06 22:21:39 2010 -0800
    46.3 @@ -68,9 +68,9 @@
    46.4    // and the char array it points to end up in the same cache line.
    46.5    oop obj;
    46.6    if (tenured) {
    46.7 -    obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_permanent_instance(CHECK_NH);
    46.8 +    obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_permanent_instance(CHECK_NH);
    46.9    } else {
   46.10 -    obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_instance(CHECK_NH);
   46.11 +    obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_instance(CHECK_NH);
   46.12    }
   46.13  
   46.14    // Create the char array.  The String object must be handlized here
   46.15 @@ -293,7 +293,7 @@
   46.16  
   46.17  bool java_lang_String::equals(oop java_string, jchar* chars, int len) {
   46.18    assert(SharedSkipVerify ||
   46.19 -         java_string->klass() == SystemDictionary::string_klass(),
   46.20 +         java_string->klass() == SystemDictionary::String_klass(),
   46.21           "must be java_string");
   46.22    typeArrayOop value  = java_lang_String::value(java_string);
   46.23    int          offset = java_lang_String::offset(java_string);
   46.24 @@ -311,7 +311,7 @@
   46.25  
   46.26  void java_lang_String::print(Handle java_string, outputStream* st) {
   46.27    oop          obj    = java_string();
   46.28 -  assert(obj->klass() == SystemDictionary::string_klass(), "must be java_string");
   46.29 +  assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string");
   46.30    typeArrayOop value  = java_lang_String::value(obj);
   46.31    int          offset = java_lang_String::offset(obj);
   46.32    int          length = java_lang_String::length(obj);
   46.33 @@ -339,9 +339,9 @@
   46.34    // class is put into the system dictionary.
   46.35    int computed_modifiers = k->compute_modifier_flags(CHECK_0);
   46.36    k->set_modifier_flags(computed_modifiers);
   46.37 -  if (SystemDictionary::class_klass_loaded()) {
   46.38 +  if (SystemDictionary::Class_klass_loaded()) {
   46.39      // Allocate mirror (java.lang.Class instance)
   46.40 -    Handle mirror = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0);
   46.41 +    Handle mirror = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0);
   46.42      // Setup indirections
   46.43      mirror->obj_field_put(klass_offset,  k());
   46.44      k->set_java_mirror(mirror());
   46.45 @@ -378,7 +378,7 @@
   46.46  oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
   46.47    // This should be improved by adding a field at the Java level or by
   46.48    // introducing a new VM klass (see comment in ClassFileParser)
   46.49 -  oop java_class = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0);
   46.50 +  oop java_class = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0);
   46.51    if (type != T_VOID) {
   46.52      klassOop aklass = Universe::typeArrayKlassObj(type);
   46.53      assert(aklass != NULL, "correct bootstrap");
   46.54 @@ -502,7 +502,7 @@
   46.55  
   46.56  oop java_lang_Class::primitive_mirror(BasicType t) {
   46.57    oop mirror = Universe::java_mirror(t);
   46.58 -  assert(mirror != NULL && mirror->is_a(SystemDictionary::class_klass()), "must be a Class");
   46.59 +  assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class");
   46.60    assert(java_lang_Class::is_primitive(mirror), "must be primitive");
   46.61    return mirror;
   46.62  }
   46.63 @@ -515,14 +515,14 @@
   46.64    assert(!offsets_computed, "offsets should be initialized only once");
   46.65    offsets_computed = true;
   46.66  
   46.67 -  klassOop k = SystemDictionary::class_klass();
   46.68 +  klassOop k = SystemDictionary::Class_klass();
   46.69    // The classRedefinedCount field is only present starting in 1.5,
   46.70    // so don't go fatal.
   46.71    compute_optional_offset(classRedefinedCount_offset,
   46.72      k, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
   46.73  
   46.74    // The field indicating parallelCapable (parallelLockMap) is only present starting in 7,
   46.75 -  klassOop k1 = SystemDictionary::classloader_klass();
   46.76 +  klassOop k1 = SystemDictionary::ClassLoader_klass();
   46.77    compute_optional_offset(parallelCapable_offset,
   46.78      k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature());
   46.79  }
   46.80 @@ -588,7 +588,7 @@
   46.81  void java_lang_Thread::compute_offsets() {
   46.82    assert(_group_offset == 0, "offsets should be initialized only once");
   46.83  
   46.84 -  klassOop k = SystemDictionary::thread_klass();
   46.85 +  klassOop k = SystemDictionary::Thread_klass();
   46.86    compute_offset(_name_offset,      k, vmSymbols::name_name(),      vmSymbols::char_array_signature());
   46.87    compute_offset(_group_offset,     k, vmSymbols::group_name(),     vmSymbols::threadgroup_signature());
   46.88    compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature());
   46.89 @@ -847,7 +847,7 @@
   46.90  void java_lang_ThreadGroup::compute_offsets() {
   46.91    assert(_parent_offset == 0, "offsets should be initialized only once");
   46.92  
   46.93 -  klassOop k = SystemDictionary::threadGroup_klass();
   46.94 +  klassOop k = SystemDictionary::ThreadGroup_klass();
   46.95  
   46.96    compute_offset(_parent_offset,      k, vmSymbols::parent_name(),      vmSymbols::threadgroup_signature());
   46.97    compute_offset(_name_offset,        k, vmSymbols::name_name(),        vmSymbols::string_signature());
   46.98 @@ -1344,7 +1344,7 @@
   46.99    // No-op if stack trace is disabled
  46.100    if (!StackTraceInThrowable) return;
  46.101  
  46.102 -  assert(throwable->is_a(SystemDictionary::throwable_klass()), "sanity check");
  46.103 +  assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check");
  46.104  
  46.105    oop backtrace = java_lang_Throwable::backtrace(throwable());
  46.106    assert(backtrace != NULL, "backtrace not preallocated");
  46.107 @@ -1449,7 +1449,7 @@
  46.108    assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4");
  46.109  
  46.110    // Allocate java.lang.StackTraceElement instance
  46.111 -  klassOop k = SystemDictionary::stackTraceElement_klass();
  46.112 +  klassOop k = SystemDictionary::StackTraceElement_klass();
  46.113    assert(k != NULL, "must be loaded in 1.4+");
  46.114    instanceKlassHandle ik (THREAD, k);
  46.115    if (ik->should_be_initialized()) {
  46.116 @@ -1487,7 +1487,7 @@
  46.117  
  46.118  
  46.119  void java_lang_reflect_AccessibleObject::compute_offsets() {
  46.120 -  klassOop k = SystemDictionary::reflect_accessible_object_klass();
  46.121 +  klassOop k = SystemDictionary::reflect_AccessibleObject_klass();
  46.122    compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature());
  46.123  }
  46.124  
  46.125 @@ -1502,7 +1502,7 @@
  46.126  }
  46.127  
  46.128  void java_lang_reflect_Method::compute_offsets() {
  46.129 -  klassOop k = SystemDictionary::reflect_method_klass();
  46.130 +  klassOop k = SystemDictionary::reflect_Method_klass();
  46.131    compute_offset(clazz_offset,          k, vmSymbols::clazz_name(),          vmSymbols::class_signature());
  46.132    compute_offset(name_offset,           k, vmSymbols::name_name(),           vmSymbols::string_signature());
  46.133    compute_offset(returnType_offset,     k, vmSymbols::returnType_name(),     vmSymbols::class_signature());
  46.134 @@ -1523,7 +1523,7 @@
  46.135  
  46.136  Handle java_lang_reflect_Method::create(TRAPS) {
  46.137    assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
  46.138 -  klassOop klass = SystemDictionary::reflect_method_klass();
  46.139 +  klassOop klass = SystemDictionary::reflect_Method_klass();
  46.140    // This class is eagerly initialized during VM initialization, since we keep a refence
  46.141    // to one of the methods
  46.142    assert(instanceKlass::cast(klass)->is_initialized(), "must be initialized");
  46.143 @@ -1665,7 +1665,7 @@
  46.144  }
  46.145  
  46.146  void java_lang_reflect_Constructor::compute_offsets() {
  46.147 -  klassOop k = SystemDictionary::reflect_constructor_klass();
  46.148 +  klassOop k = SystemDictionary::reflect_Constructor_klass();
  46.149    compute_offset(clazz_offset,          k, vmSymbols::clazz_name(),          vmSymbols::class_signature());
  46.150    compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature());
  46.151    compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature());
  46.152 @@ -1789,7 +1789,7 @@
  46.153  }
  46.154  
  46.155  void java_lang_reflect_Field::compute_offsets() {
  46.156 -  klassOop k = SystemDictionary::reflect_field_klass();
  46.157 +  klassOop k = SystemDictionary::reflect_Field_klass();
  46.158    compute_offset(clazz_offset,     k, vmSymbols::clazz_name(),     vmSymbols::class_signature());
  46.159    compute_offset(name_offset,      k, vmSymbols::name_name(),      vmSymbols::string_signature());
  46.160    compute_offset(type_offset,      k, vmSymbols::type_name(),      vmSymbols::class_signature());
  46.161 @@ -1896,7 +1896,7 @@
  46.162  
  46.163  
  46.164  void sun_reflect_ConstantPool::compute_offsets() {
  46.165 -  klassOop k = SystemDictionary::reflect_constant_pool_klass();
  46.166 +  klassOop k = SystemDictionary::reflect_ConstantPool_klass();
  46.167    // This null test can be removed post beta
  46.168    if (k != NULL) {
  46.169      compute_offset(_cp_oop_offset, k, vmSymbols::constantPoolOop_name(), vmSymbols::object_signature());
  46.170 @@ -1906,7 +1906,7 @@
  46.171  
  46.172  Handle sun_reflect_ConstantPool::create(TRAPS) {
  46.173    assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
  46.174 -  klassOop k = SystemDictionary::reflect_constant_pool_klass();
  46.175 +  klassOop k = SystemDictionary::reflect_ConstantPool_klass();
  46.176    instanceKlassHandle klass (THREAD, k);
  46.177    // Ensure it is initialized
  46.178    klass->initialize(CHECK_NH);
  46.179 @@ -1926,7 +1926,7 @@
  46.180  }
  46.181  
  46.182  void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() {
  46.183 -  klassOop k = SystemDictionary::reflect_unsafe_static_field_accessor_impl_klass();
  46.184 +  klassOop k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass();
  46.185    // This null test can be removed post beta
  46.186    if (k != NULL) {
  46.187      compute_offset(_base_offset, k,
  46.188 @@ -2072,7 +2072,7 @@
  46.189  
  46.190  // Support for java_lang_ref_Reference
  46.191  oop java_lang_ref_Reference::pending_list_lock() {
  46.192 -  instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass());
  46.193 +  instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass());
  46.194    char *addr = (((char *)ik->start_of_static_fields()) + static_lock_offset);
  46.195    if (UseCompressedOops) {
  46.196      return oopDesc::load_decode_heap_oop((narrowOop *)addr);
  46.197 @@ -2082,7 +2082,7 @@
  46.198  }
  46.199  
  46.200  HeapWord *java_lang_ref_Reference::pending_list_addr() {
  46.201 -  instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass());
  46.202 +  instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass());
  46.203    char *addr = (((char *)ik->start_of_static_fields()) + static_pending_offset);
  46.204    // XXX This might not be HeapWord aligned, almost rather be char *.
  46.205    return (HeapWord*)addr;
  46.206 @@ -2105,17 +2105,17 @@
  46.207  }
  46.208  
  46.209  jlong java_lang_ref_SoftReference::clock() {
  46.210 -  instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass());
  46.211 +  instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass());
  46.212    int offset = ik->offset_of_static_fields() + static_clock_offset;
  46.213  
  46.214 -  return SystemDictionary::soft_reference_klass()->long_field(offset);
  46.215 +  return SystemDictionary::SoftReference_klass()->long_field(offset);
  46.216  }
  46.217  
  46.218  void java_lang_ref_SoftReference::set_clock(jlong value) {
  46.219 -  instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass());
  46.220 +  instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass());
  46.221    int offset = ik->offset_of_static_fields() + static_clock_offset;
  46.222  
  46.223 -  SystemDictionary::soft_reference_klass()->long_field_put(offset, value);
  46.224 +  SystemDictionary::SoftReference_klass()->long_field_put(offset, value);
  46.225  }
  46.226  
  46.227  
  46.228 @@ -2403,6 +2403,10 @@
  46.229    return ptypes(mt)->obj_at(idx);
  46.230  }
  46.231  
  46.232 +int java_dyn_MethodType::ptype_count(oop mt) {
  46.233 +  return ptypes(mt)->length();
  46.234 +}
  46.235 +
  46.236  
  46.237  
  46.238  // Support for java_dyn_MethodTypeForm
  46.239 @@ -2534,7 +2538,7 @@
  46.240      // the generated bytecodes for reflection, and if so, "magically"
  46.241      // delegate to its parent to prevent class loading from occurring
  46.242      // in places where applications using reflection didn't expect it.
  46.243 -    klassOop delegating_cl_class = SystemDictionary::reflect_delegating_classloader_klass();
  46.244 +    klassOop delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass();
  46.245      // This might be null in non-1.4 JDKs
  46.246      if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) {
  46.247        return parent(loader);
  46.248 @@ -2549,7 +2553,7 @@
  46.249  void java_lang_System::compute_offsets() {
  46.250    assert(offset_of_static_fields == 0, "offsets should be initialized only once");
  46.251  
  46.252 -  instanceKlass* ik = instanceKlass::cast(SystemDictionary::system_klass());
  46.253 +  instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass());
  46.254    offset_of_static_fields = ik->offset_of_static_fields();
  46.255  }
  46.256  

    47.1 --- a/src/share/vm/classfile/javaClasses.hpp	Wed Dec 23 03:12:16 2009 -0800
    47.2 +++ b/src/share/vm/classfile/javaClasses.hpp	Wed Jan 06 22:21:39 2010 -0800
    47.3 @@ -111,7 +111,7 @@
    47.4  
    47.5    // Testers
    47.6    static bool is_instance(oop obj) {
    47.7 -    return obj != NULL && obj->klass() == SystemDictionary::string_klass();
    47.8 +    return obj != NULL && obj->klass() == SystemDictionary::String_klass();
    47.9    }
   47.10  
   47.11    // Debugging
   47.12 @@ -161,7 +161,7 @@
   47.13    static void print_signature(oop java_class, outputStream *st);
   47.14    // Testing
   47.15    static bool is_instance(oop obj) {
   47.16 -    return obj != NULL && obj->klass() == SystemDictionary::class_klass();
   47.17 +    return obj != NULL && obj->klass() == SystemDictionary::Class_klass();
   47.18    }
   47.19    static bool is_primitive(oop java_class);
   47.20    static BasicType primitive_type(oop java_class);
   47.21 @@ -1027,6 +1027,7 @@
   47.22    static oop            form(oop mt);
   47.23  
   47.24    static oop            ptype(oop mt, int index);
   47.25 +  static int            ptype_count(oop mt);
   47.26  
   47.27    static symbolOop      as_signature(oop mt, bool intern_if_not_found, TRAPS);
   47.28    static void           print_signature(oop mt, outputStream* st);
   47.29 @@ -1083,6 +1084,14 @@
   47.30    static oop            vmmethod(oop site);
   47.31    static void       set_vmmethod(oop site, oop ref);
   47.32  
   47.33 +  // Testers
   47.34 +  static bool is_subclass(klassOop klass) {
   47.35 +    return Klass::cast(klass)->is_subclass_of(SystemDictionary::CallSite_klass());
   47.36 +  }
   47.37 +  static bool is_instance(oop obj) {
   47.38 +    return obj != NULL && is_subclass(obj->klass());
   47.39 +  }
   47.40 +
   47.41    // Accessors for code generation:
   47.42    static int target_offset_in_bytes()           { return _target_offset; }
   47.43    static int type_offset_in_bytes()             { return _type_offset; }

    48.1 --- a/src/share/vm/classfile/systemDictionary.cpp	Wed Dec 23 03:12:16 2009 -0800
    48.2 +++ b/src/share/vm/classfile/systemDictionary.cpp	Wed Jan 06 22:21:39 2010 -0800
    48.3 @@ -60,10 +60,10 @@
    48.4  }
    48.5  
    48.6  void SystemDictionary::compute_java_system_loader(TRAPS) {
    48.7 -  KlassHandle system_klass(THREAD, WK_KLASS(classloader_klass));
    48.8 +  KlassHandle system_klass(THREAD, WK_KLASS(ClassLoader_klass));
    48.9    JavaValue result(T_OBJECT);
   48.10    JavaCalls::call_static(&result,
   48.11 -                         KlassHandle(THREAD, WK_KLASS(classloader_klass)),
   48.12 +                         KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)),
   48.13                           vmSymbolHandles::getSystemClassLoader_name(),
   48.14                           vmSymbolHandles::void_classloader_signature(),
   48.15                           CHECK);
   48.16 @@ -128,7 +128,7 @@
   48.17      // in which case we have to check whether the pending exception is a ClassNotFoundException,
   48.18      // and if so convert it to a NoClassDefFoundError
   48.19      // And chain the original ClassNotFoundException
   48.20 -    if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass())) {
   48.21 +    if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass())) {
   48.22        ResourceMark rm(THREAD);
   48.23        assert(klass_h() == NULL, "Should not have result with exception pending");
   48.24        Handle e(THREAD, PENDING_EXCEPTION);
   48.25 @@ -359,7 +359,7 @@
   48.26  
   48.27    assert(class_loader() != NULL, "should not have non-null protection domain for null classloader");
   48.28  
   48.29 -  KlassHandle system_loader(THREAD, SystemDictionary::classloader_klass());
   48.30 +  KlassHandle system_loader(THREAD, SystemDictionary::ClassLoader_klass());
   48.31    JavaCalls::call_special(&result,
   48.32                           class_loader,
   48.33                           system_loader,
   48.34 @@ -743,7 +743,7 @@
   48.35        // Bootstrap goes through here to allow for an extra guarantee check
   48.36        if (UnsyncloadClass || (class_loader.is_null())) {
   48.37          if (k.is_null() && HAS_PENDING_EXCEPTION
   48.38 -          && PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) {
   48.39 +          && PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) {
   48.40            MutexLocker mu(SystemDictionary_lock, THREAD);
   48.41            klassOop check = find_class(d_index, d_hash, name, class_loader);
   48.42            if (check != NULL) {
   48.43 @@ -1367,7 +1367,7 @@
   48.44  
   48.45      JavaValue result(T_OBJECT);
   48.46  
   48.47 -    KlassHandle spec_klass (THREAD, SystemDictionary::classloader_klass());
   48.48 +    KlassHandle spec_klass (THREAD, SystemDictionary::ClassLoader_klass());
   48.49  
   48.50      // Call public unsynchronized loadClass(String) directly for all class loaders
   48.51      // for parallelCapable class loaders. JDK >=7, loadClass(String, boolean) will
   48.52 @@ -1944,13 +1944,13 @@
   48.53  
   48.54  
   48.55  void SystemDictionary::initialize_preloaded_classes(TRAPS) {
   48.56 -  assert(WK_KLASS(object_klass) == NULL, "preloaded classes should only be initialized once");
   48.57 +  assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once");
   48.58    // Preload commonly used klasses
   48.59    WKID scan = FIRST_WKID;
   48.60    // first do Object, String, Class
   48.61 -  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(class_klass), scan, CHECK);
   48.62 +  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
   48.63  
   48.64 -  debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(class_klass)));
   48.65 +  debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass)));
   48.66  
   48.67    // Fixup mirrors for classes loaded before java.lang.Class.
   48.68    // These calls iterate over the objects currently in the perm gen
   48.69 @@ -1961,17 +1961,17 @@
   48.70    Universe::fixup_mirrors(CHECK);
   48.71  
   48.72    // do a bunch more:
   48.73 -  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(reference_klass), scan, CHECK);
   48.74 +  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK);
   48.75  
   48.76    // Preload ref klasses and set reference types
   48.77 -  instanceKlass::cast(WK_KLASS(reference_klass))->set_reference_type(REF_OTHER);
   48.78 -  instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(reference_klass));
   48.79 +  instanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
   48.80 +  instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
   48.81  
   48.82 -  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(phantom_reference_klass), scan, CHECK);
   48.83 -  instanceKlass::cast(WK_KLASS(soft_reference_klass))->set_reference_type(REF_SOFT);
   48.84 -  instanceKlass::cast(WK_KLASS(weak_reference_klass))->set_reference_type(REF_WEAK);
   48.85 -  instanceKlass::cast(WK_KLASS(final_reference_klass))->set_reference_type(REF_FINAL);
   48.86 -  instanceKlass::cast(WK_KLASS(phantom_reference_klass))->set_reference_type(REF_PHANTOM);
   48.87 +  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
   48.88 +  instanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
   48.89 +  instanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
   48.90 +  instanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
   48.91 +  instanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
   48.92  
   48.93    WKID meth_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
   48.94    WKID meth_group_end   = WK_KLASS_ENUM_NAME(WrongMethodTypeException_klass);
   48.95 @@ -1984,7 +1984,7 @@
   48.96      scan = WKID(meth_group_end+1);
   48.97    }
   48.98    WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_klass);
   48.99 -  WKID indy_group_end   = WK_KLASS_ENUM_NAME(Dynamic_klass);
  48.100 +  WKID indy_group_end   = WK_KLASS_ENUM_NAME(InvokeDynamic_klass);
  48.101    initialize_wk_klasses_until(indy_group_start, scan, CHECK);
  48.102    if (EnableInvokeDynamic) {
  48.103      initialize_wk_klasses_through(indy_group_end, scan, CHECK);
  48.104 @@ -1996,14 +1996,14 @@
  48.105  
  48.106    initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK);
  48.107  
  48.108 -  _box_klasses[T_BOOLEAN] = WK_KLASS(boolean_klass);
  48.109 -  _box_klasses[T_CHAR]    = WK_KLASS(char_klass);
  48.110 -  _box_klasses[T_FLOAT]   = WK_KLASS(float_klass);
  48.111 -  _box_klasses[T_DOUBLE]  = WK_KLASS(double_klass);
  48.112 -  _box_klasses[T_BYTE]    = WK_KLASS(byte_klass);
  48.113 -  _box_klasses[T_SHORT]   = WK_KLASS(short_klass);
  48.114 -  _box_klasses[T_INT]     = WK_KLASS(int_klass);
  48.115 -  _box_klasses[T_LONG]    = WK_KLASS(long_klass);
  48.116 +  _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass);
  48.117 +  _box_klasses[T_CHAR]    = WK_KLASS(Character_klass);
  48.118 +  _box_klasses[T_FLOAT]   = WK_KLASS(Float_klass);
  48.119 +  _box_klasses[T_DOUBLE]  = WK_KLASS(Double_klass);
  48.120 +  _box_klasses[T_BYTE]    = WK_KLASS(Byte_klass);
  48.121 +  _box_klasses[T_SHORT]   = WK_KLASS(Short_klass);
  48.122 +  _box_klasses[T_INT]     = WK_KLASS(Integer_klass);
  48.123 +  _box_klasses[T_LONG]    = WK_KLASS(Long_klass);
  48.124    //_box_klasses[T_OBJECT]  = WK_KLASS(object_klass);
  48.125    //_box_klasses[T_ARRAY]   = WK_KLASS(object_klass);
  48.126  
  48.127 @@ -2014,11 +2014,11 @@
  48.128  #endif // KERNEL
  48.129  
  48.130    { // Compute whether we should use loadClass or loadClassInternal when loading classes.
  48.131 -    methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
  48.132 +    methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
  48.133      _has_loadClassInternal = (method != NULL);
  48.134    }
  48.135    { // Compute whether we should use checkPackageAccess or NOT
  48.136 -    methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature());
  48.137 +    methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature());
  48.138      _has_checkPackageAccess = (method != NULL);
  48.139    }
  48.140  }
  48.141 @@ -2340,6 +2340,8 @@
  48.142    SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature);
  48.143    if (spe == NULL || spe->property_oop() == NULL) {
  48.144      // Must create lots of stuff here, but outside of the SystemDictionary lock.
  48.145 +    if (THREAD->is_Compiler_thread())
  48.146 +      return NULL;              // do not attempt from within compiler
  48.147      Handle mt = compute_method_handle_type(signature(),
  48.148                                             class_loader, protection_domain,
  48.149                                             CHECK_NULL);
  48.150 @@ -2372,7 +2374,7 @@
  48.151                                                      TRAPS) {
  48.152    Handle empty;
  48.153    int npts = ArgumentCount(signature()).size();
  48.154 -  objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::class_klass(), npts, CHECK_(empty));
  48.155 +  objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty));
  48.156    int arg = 0;
  48.157    Handle rt;                            // the return type from the signature
  48.158    for (SignatureStream ss(signature()); !ss.is_done(); ss.next()) {

    49.1 --- a/src/share/vm/classfile/systemDictionary.hpp	Wed Dec 23 03:12:16 2009 -0800
    49.2 +++ b/src/share/vm/classfile/systemDictionary.hpp	Wed Jan 06 22:21:39 2010 -0800
    49.3 @@ -82,55 +82,55 @@
    49.4  
    49.5  #define WK_KLASSES_DO(template)                                               \
    49.6    /* well-known classes */                                                    \
    49.7 -  template(object_klass,                 java_lang_Object,               Pre) \
    49.8 -  template(string_klass,                 java_lang_String,               Pre) \
    49.9 -  template(class_klass,                  java_lang_Class,                Pre) \
   49.10 -  template(cloneable_klass,              java_lang_Cloneable,            Pre) \
   49.11 -  template(classloader_klass,            java_lang_ClassLoader,          Pre) \
   49.12 -  template(serializable_klass,           java_io_Serializable,           Pre) \
   49.13 -  template(system_klass,                 java_lang_System,               Pre) \
   49.14 -  template(throwable_klass,              java_lang_Throwable,            Pre) \
   49.15 -  template(error_klass,                  java_lang_Error,                Pre) \
   49.16 -  template(threaddeath_klass,            java_lang_ThreadDeath,          Pre) \
   49.17 -  template(exception_klass,              java_lang_Exception,            Pre) \
   49.18 -  template(runtime_exception_klass,      java_lang_RuntimeException,     Pre) \
   49.19 -  template(protectionDomain_klass,       java_security_ProtectionDomain, Pre) \
   49.20 +  template(Object_klass,                 java_lang_Object,               Pre) \
   49.21 +  template(String_klass,                 java_lang_String,               Pre) \
   49.22 +  template(Class_klass,                  java_lang_Class,                Pre) \
   49.23 +  template(Cloneable_klass,              java_lang_Cloneable,            Pre) \
   49.24 +  template(ClassLoader_klass,            java_lang_ClassLoader,          Pre) \
   49.25 +  template(Serializable_klass,           java_io_Serializable,           Pre) \
   49.26 +  template(System_klass,                 java_lang_System,               Pre) \
   49.27 +  template(Throwable_klass,              java_lang_Throwable,            Pre) \
   49.28 +  template(Error_klass,                  java_lang_Error,                Pre) \
   49.29 +  template(ThreadDeath_klass,            java_lang_ThreadDeath,          Pre) \
   49.30 +  template(Exception_klass,              java_lang_Exception,            Pre) \
   49.31 +  template(RuntimeException_klass,       java_lang_RuntimeException,     Pre) \
   49.32 +  template(ProtectionDomain_klass,       java_security_ProtectionDomain, Pre) \
   49.33    template(AccessControlContext_klass,   java_security_AccessControlContext, Pre) \
   49.34 -  template(classNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \
   49.35 -  template(noClassDefFoundError_klass,   java_lang_NoClassDefFoundError, Pre) \
   49.36 -  template(linkageError_klass,           java_lang_LinkageError,         Pre) \
   49.37 +  template(ClassNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \
   49.38 +  template(NoClassDefFoundError_klass,   java_lang_NoClassDefFoundError, Pre) \
   49.39 +  template(LinkageError_klass,           java_lang_LinkageError,         Pre) \
   49.40    template(ClassCastException_klass,     java_lang_ClassCastException,   Pre) \
   49.41    template(ArrayStoreException_klass,    java_lang_ArrayStoreException,  Pre) \
   49.42 -  template(virtualMachineError_klass,    java_lang_VirtualMachineError,  Pre) \
   49.43 +  template(VirtualMachineError_klass,    java_lang_VirtualMachineError,  Pre) \
   49.44    template(OutOfMemoryError_klass,       java_lang_OutOfMemoryError,     Pre) \
   49.45    template(StackOverflowError_klass,     java_lang_StackOverflowError,   Pre) \
   49.46    template(IllegalMonitorStateException_klass, java_lang_IllegalMonitorStateException, Pre) \
   49.47 -  template(reference_klass,              java_lang_ref_Reference,        Pre) \
   49.48 +  template(Reference_klass,              java_lang_ref_Reference,        Pre) \
   49.49                                                                                \
   49.50    /* Preload ref klasses and set reference types */                           \
   49.51 -  template(soft_reference_klass,         java_lang_ref_SoftReference,    Pre) \
   49.52 -  template(weak_reference_klass,         java_lang_ref_WeakReference,    Pre) \
   49.53 -  template(final_reference_klass,        java_lang_ref_FinalReference,   Pre) \
   49.54 -  template(phantom_reference_klass,      java_lang_ref_PhantomReference, Pre) \
   49.55 -  template(finalizer_klass,              java_lang_ref_Finalizer,        Pre) \
   49.56 +  template(SoftReference_klass,          java_lang_ref_SoftReference,    Pre) \
   49.57 +  template(WeakReference_klass,          java_lang_ref_WeakReference,    Pre) \
   49.58 +  template(FinalReference_klass,         java_lang_ref_FinalReference,   Pre) \
   49.59 +  template(PhantomReference_klass,       java_lang_ref_PhantomReference, Pre) \
   49.60 +  template(Finalizer_klass,              java_lang_ref_Finalizer,        Pre) \
   49.61                                                                                \
   49.62 -  template(thread_klass,                 java_lang_Thread,               Pre) \
   49.63 -  template(threadGroup_klass,            java_lang_ThreadGroup,          Pre) \
   49.64 -  template(properties_klass,             java_util_Properties,           Pre) \
   49.65 -  template(reflect_accessible_object_klass, java_lang_reflect_AccessibleObject, Pre) \
   49.66 -  template(reflect_field_klass,          java_lang_reflect_Field,        Pre) \
   49.67 -  template(reflect_method_klass,         java_lang_reflect_Method,       Pre) \
   49.68 -  template(reflect_constructor_klass,    java_lang_reflect_Constructor,  Pre) \
   49.69 +  template(Thread_klass,                 java_lang_Thread,               Pre) \
   49.70 +  template(ThreadGroup_klass,            java_lang_ThreadGroup,          Pre) \
   49.71 +  template(Properties_klass,             java_util_Properties,           Pre) \
   49.72 +  template(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre) \
   49.73 +  template(reflect_Field_klass,          java_lang_reflect_Field,        Pre) \
   49.74 +  template(reflect_Method_klass,         java_lang_reflect_Method,       Pre) \
   49.75 +  template(reflect_Constructor_klass,    java_lang_reflect_Constructor,  Pre) \
   49.76                                                                                \
   49.77    /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \
   49.78    /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
   49.79    /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
   49.80 -  template(reflect_magic_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
   49.81 -  template(reflect_method_accessor_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
   49.82 -  template(reflect_constructor_accessor_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
   49.83 -  template(reflect_delegating_classloader_klass, sun_reflect_DelegatingClassLoader, Opt) \
   49.84 -  template(reflect_constant_pool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
   49.85 -  template(reflect_unsafe_static_field_accessor_impl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
   49.86 +  template(reflect_MagicAccessorImpl_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
   49.87 +  template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
   49.88 +  template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
   49.89 +  template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \
   49.90 +  template(reflect_ConstantPool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
   49.91 +  template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
   49.92                                                                                \
   49.93    /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \
   49.94    template(MethodHandle_klass,           java_dyn_MethodHandle,          Opt) \
   49.95 @@ -144,16 +144,14 @@
   49.96    template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
   49.97    template(Linkage_klass,                java_dyn_Linkage,               Opt) \
   49.98    template(CallSite_klass,               java_dyn_CallSite,              Opt) \
   49.99 -  template(Dynamic_klass,                java_dyn_Dynamic,               Opt) \
  49.100 +  template(InvokeDynamic_klass,          java_dyn_InvokeDynamic,         Opt) \
  49.101    /* Note: MethodHandle must be first, and Dynamic last in group */           \
  49.102                                                                                \
  49.103 -  template(vector_klass,                 java_util_Vector,               Pre) \
  49.104 -  template(hashtable_klass,              java_util_Hashtable,            Pre) \
  49.105 -  template(stringBuffer_klass,           java_lang_StringBuffer,         Pre) \
  49.106 +  template(StringBuffer_klass,           java_lang_StringBuffer,         Pre) \
  49.107    template(StringBuilder_klass,          java_lang_StringBuilder,        Pre) \
  49.108                                                                                \
  49.109    /* It's NULL in non-1.4 JDKs. */                                            \
  49.110 -  template(stackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
  49.111 +  template(StackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
  49.112    /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
  49.113    /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
  49.114    template(java_nio_Buffer_klass,        java_nio_Buffer,                Opt) \
  49.115 @@ -164,14 +162,14 @@
  49.116    template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
  49.117                                                                                \
  49.118    /* Preload boxing klasses */                                                \
  49.119 -  template(boolean_klass,                java_lang_Boolean,              Pre) \
  49.120 -  template(char_klass,                   java_lang_Character,            Pre) \
  49.121 -  template(float_klass,                  java_lang_Float,                Pre) \
  49.122 -  template(double_klass,                 java_lang_Double,               Pre) \
  49.123 -  template(byte_klass,                   java_lang_Byte,                 Pre) \
  49.124 -  template(short_klass,                  java_lang_Short,                Pre) \
  49.125 -  template(int_klass,                    java_lang_Integer,              Pre) \
  49.126 -  template(long_klass,                   java_lang_Long,                 Pre) \
  49.127 +  template(Boolean_klass,                java_lang_Boolean,              Pre) \
  49.128 +  template(Character_klass,              java_lang_Character,            Pre) \
  49.129 +  template(Float_klass,                  java_lang_Float,                Pre) \
  49.130 +  template(Double_klass,                 java_lang_Double,               Pre) \
  49.131 +  template(Byte_klass,                   java_lang_Byte,                 Pre) \
  49.132 +  template(Short_klass,                  java_lang_Short,                Pre) \
  49.133 +  template(Integer_klass,                java_lang_Integer,              Pre) \
  49.134 +  template(Long_klass,                   java_lang_Long,                 Pre) \
  49.135    /*end*/
  49.136  
  49.137  
  49.138 @@ -438,8 +436,8 @@
  49.139    // Tells whether ClassLoader.checkPackageAccess is present
  49.140    static bool has_checkPackageAccess()      { return _has_checkPackageAccess; }
  49.141  
  49.142 -  static bool class_klass_loaded()          { return WK_KLASS(class_klass) != NULL; }
  49.143 -  static bool cloneable_klass_loaded()      { return WK_KLASS(cloneable_klass) != NULL; }
  49.144 +  static bool Class_klass_loaded()          { return WK_KLASS(Class_klass) != NULL; }
  49.145 +  static bool Cloneable_klass_loaded()      { return WK_KLASS(Cloneable_klass) != NULL; }
  49.146  
  49.147    // Returns default system loader
  49.148    static oop java_system_loader();

    50.1 --- a/src/share/vm/classfile/verifier.cpp	Wed Dec 23 03:12:16 2009 -0800
    50.2 +++ b/src/share/vm/classfile/verifier.cpp	Wed Jan 06 22:21:39 2010 -0800
    50.3 @@ -143,7 +143,7 @@
    50.4  
    50.5  bool Verifier::is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class) {
    50.6    symbolOop name = klass->name();
    50.7 -  klassOop refl_magic_klass = SystemDictionary::reflect_magic_klass();
    50.8 +  klassOop refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass();
    50.9  
   50.10    return (should_verify_for(klass->class_loader(), should_verify_class) &&
   50.11      // return if the class is a bootstrapping class

    51.1 --- a/src/share/vm/classfile/vmSymbols.cpp	Wed Dec 23 03:12:16 2009 -0800
    51.2 +++ b/src/share/vm/classfile/vmSymbols.cpp	Wed Jan 06 22:21:39 2010 -0800
    51.3 @@ -1,5 +1,5 @@
    51.4  /*
    51.5 - * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
    51.6 + * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
    51.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.8   *
    51.9   * This code is free software; you can redistribute it and/or modify it
   51.10 @@ -70,6 +70,7 @@
   51.11  void vmSymbols::initialize(TRAPS) {
   51.12    assert((int)SID_LIMIT <= (1<<log2_SID_LIMIT), "must fit in this bitfield");
   51.13    assert((int)SID_LIMIT*5 > (1<<log2_SID_LIMIT), "make the bitfield smaller, please");
   51.14 +  assert(vmIntrinsics::FLAG_LIMIT <= (1 << vmIntrinsics::log2_FLAG_LIMIT), "must fit in this bitfield");
   51.15  
   51.16    if (!UseSharedSpaces) {
   51.17      const char* string = &vm_symbol_bodies[0];
   51.18 @@ -271,6 +272,58 @@
   51.19    return sid;
   51.20  }
   51.21  
   51.22 +static vmIntrinsics::ID wrapper_intrinsic(BasicType type, bool unboxing) {
   51.23 +#define TYPE2(type, unboxing) ((int)(type)*2 + ((unboxing) ? 1 : 0))
   51.24 +  switch (TYPE2(type, unboxing)) {
   51.25 +#define BASIC_TYPE_CASE(type, box, unbox) \
   51.26 +    case TYPE2(type, false):  return vmIntrinsics::box; \
   51.27 +    case TYPE2(type, true):   return vmIntrinsics::unbox
   51.28 +    BASIC_TYPE_CASE(T_BOOLEAN, _Boolean_valueOf,   _booleanValue);
   51.29 +    BASIC_TYPE_CASE(T_BYTE,    _Byte_valueOf,      _byteValue);
   51.30 +    BASIC_TYPE_CASE(T_CHAR,    _Character_valueOf, _charValue);
   51.31 +    BASIC_TYPE_CASE(T_SHORT,   _Short_valueOf,     _shortValue);
   51.32 +    BASIC_TYPE_CASE(T_INT,     _Integer_valueOf,   _intValue);
   51.33 +    BASIC_TYPE_CASE(T_LONG,    _Long_valueOf,      _longValue);
   51.34 +    BASIC_TYPE_CASE(T_FLOAT,   _Float_valueOf,     _floatValue);
   51.35 +    BASIC_TYPE_CASE(T_DOUBLE,  _Double_valueOf,    _doubleValue);
   51.36 +#undef BASIC_TYPE_CASE
   51.37 +  }
   51.38 +#undef TYPE2
   51.39 +  return vmIntrinsics::_none;
   51.40 +}
   51.41 +
   51.42 +vmIntrinsics::ID vmIntrinsics::for_boxing(BasicType type) {
   51.43 +  return wrapper_intrinsic(type, false);
   51.44 +}
   51.45 +vmIntrinsics::ID vmIntrinsics::for_unboxing(BasicType type) {
   51.46 +  return wrapper_intrinsic(type, true);
   51.47 +}
   51.48 +
   51.49 +vmIntrinsics::ID vmIntrinsics::for_raw_conversion(BasicType src, BasicType dest) {
   51.50 +#define SRC_DEST(s,d) (((int)(s) << 4) + (int)(d))
   51.51 +  switch (SRC_DEST(src, dest)) {
   51.52 +  case SRC_DEST(T_INT, T_FLOAT):   return vmIntrinsics::_intBitsToFloat;
   51.53 +  case SRC_DEST(T_FLOAT, T_INT):   return vmIntrinsics::_floatToRawIntBits;
   51.54 +
   51.55 +  case SRC_DEST(T_LONG, T_DOUBLE): return vmIntrinsics::_longBitsToDouble;
   51.56 +  case SRC_DEST(T_DOUBLE, T_LONG): return vmIntrinsics::_doubleToRawLongBits;
   51.57 +  }
   51.58 +#undef SRC_DEST
   51.59 +
   51.60 +  return vmIntrinsics::_none;
   51.61 +}
   51.62 +
   51.63 +methodOop vmIntrinsics::method_for(vmIntrinsics::ID id) {
   51.64 +  if (id == _none)  return NULL;
   51.65 +  symbolOop cname = vmSymbols::symbol_at(class_for(id));
   51.66 +  symbolOop mname = vmSymbols::symbol_at(name_for(id));
   51.67 +  symbolOop msig  = vmSymbols::symbol_at(signature_for(id));
   51.68 +  if (cname == NULL || mname == NULL || msig == NULL)  return NULL;
   51.69 +  klassOop k = SystemDictionary::find_well_known_klass(cname);
   51.70 +  if (k == NULL)  return NULL;
   51.71 +  return instanceKlass::cast(k)->find_method(mname, msig);
   51.72 +}
   51.73 +
   51.74  
   51.75  #define VM_INTRINSIC_INITIALIZE(id, klass, name, sig, flags) #id "\0"
   51.76  static const char* vm_intrinsic_name_bodies =
   51.77 @@ -330,15 +383,15 @@
   51.78  }
   51.79  
   51.80  // These are for forming case labels:
   51.81 -#define ID3(x, y, z) (( jint)(z) +                                  \
   51.82 -                      ((jint)(y) <<    vmSymbols::log2_SID_LIMIT) + \
   51.83 -                      ((jint)(x) << (2*vmSymbols::log2_SID_LIMIT))  )
   51.84 +#define ID3(x, y, z) (( jlong)(z) +                                  \
   51.85 +                      ((jlong)(y) <<    vmSymbols::log2_SID_LIMIT) + \
   51.86 +                      ((jlong)(x) << (2*vmSymbols::log2_SID_LIMIT))  )
   51.87  #define SID_ENUM(n) vmSymbols::VM_SYMBOL_ENUM_NAME(n)
   51.88  
   51.89 -vmIntrinsics::ID vmIntrinsics::find_id(vmSymbols::SID holder,
   51.90 -                                       vmSymbols::SID name,
   51.91 -                                       vmSymbols::SID sig,
   51.92 -                                       jshort flags) {
   51.93 +vmIntrinsics::ID vmIntrinsics::find_id_impl(vmSymbols::SID holder,
   51.94 +                                            vmSymbols::SID name,
   51.95 +                                            vmSymbols::SID sig,
   51.96 +                                            jshort flags) {
   51.97    assert((int)vmSymbols::SID_LIMIT <= (1<<vmSymbols::log2_SID_LIMIT), "must fit");
   51.98  
   51.99    // Let the C compiler build the decision tree.
  51.100 @@ -383,62 +436,50 @@
  51.101  }
  51.102  
  51.103  
  51.104 -// These are for friendly printouts of intrinsics:
  51.105 +// These are to get information about intrinsics.
  51.106 +
  51.107 +#define ID4(x, y, z, f) ((ID3(x, y, z) << vmIntrinsics::log2_FLAG_LIMIT) | (jlong) (f))
  51.108 +
  51.109 +static const jlong intrinsic_info_array[vmIntrinsics::ID_LIMIT+1] = {
  51.110 +#define VM_INTRINSIC_INFO(ignore_id, klass, name, sig, fcode) \
  51.111 +  ID4(SID_ENUM(klass), SID_ENUM(name), SID_ENUM(sig), vmIntrinsics::fcode),
  51.112 +
  51.113 +  0, VM_INTRINSICS_DO(VM_INTRINSIC_INFO,
  51.114 +                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE)
  51.115 +    0
  51.116 +#undef VM_INTRINSIC_INFO
  51.117 +};
  51.118 +
  51.119 +inline jlong intrinsic_info(vmIntrinsics::ID id) {
  51.120 +  return intrinsic_info_array[vmIntrinsics::ID_from((int)id)];
  51.121 +}
  51.122  
  51.123  vmSymbols::SID vmIntrinsics::class_for(vmIntrinsics::ID id) {
  51.124 -#ifndef PRODUCT
  51.125 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
  51.126 -  case id: return SID_ENUM(klass);
  51.127 -
  51.128 -  switch (id) {
  51.129 -    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
  51.130 -                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
  51.131 -  }
  51.132 -#undef VM_INTRINSIC_CASE
  51.133 -#endif //PRODUCT
  51.134 -  return vmSymbols::NO_SID;
  51.135 +  jlong info = intrinsic_info(id);
  51.136 +  int shift = 2*vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
  51.137 +  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1021, "");
  51.138 +  return vmSymbols::SID( (info >> shift) & mask );
  51.139  }
  51.140  
  51.141  vmSymbols::SID vmIntrinsics::name_for(vmIntrinsics::ID id) {
  51.142 -#ifndef PRODUCT
  51.143 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
  51.144 -  case id: return SID_ENUM(name);
  51.145 -
  51.146 -  switch (id) {
  51.147 -    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
  51.148 -                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
  51.149 -  }
  51.150 -#undef VM_INTRINSIC_CASE
  51.151 -#endif //PRODUCT
  51.152 -  return vmSymbols::NO_SID;
  51.153 +  jlong info = intrinsic_info(id);
  51.154 +  int shift = vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
  51.155 +  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1022, "");
  51.156 +  return vmSymbols::SID( (info >> shift) & mask );
  51.157  }
  51.158  
  51.159  vmSymbols::SID vmIntrinsics::signature_for(vmIntrinsics::ID id) {
  51.160 -#ifndef PRODUCT
  51.161 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
  51.162 -  case id: return SID_ENUM(sig);
  51.163 -
  51.164 -  switch (id) {
  51.165 -    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
  51.166 -                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
  51.167 -  }
  51.168 -#undef VM_INTRINSIC_CASE
  51.169 -#endif //PRODUCT
  51.170 -  return vmSymbols::NO_SID;
  51.171 +  jlong info = intrinsic_info(id);
  51.172 +  int shift = log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
  51.173 +  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1023, "");
  51.174 +  return vmSymbols::SID( (info >> shift) & mask );
  51.175  }
  51.176  
  51.177  vmIntrinsics::Flags vmIntrinsics::flags_for(vmIntrinsics::ID id) {
  51.178 -#ifndef PRODUCT
  51.179 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
  51.180 -  case id: return fcode;
  51.181 -
  51.182 -  switch (id) {
  51.183 -    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
  51.184 -                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
  51.185 -  }
  51.186 -#undef VM_INTRINSIC_CASE
  51.187 -#endif //PRODUCT
  51.188 -  return F_none;
  51.189 +  jlong info = intrinsic_info(id);
  51.190 +  int shift = 0, mask = right_n_bits(log2_FLAG_LIMIT);
  51.191 +  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 15, "");
  51.192 +  return Flags( (info >> shift) & mask );
  51.193  }
  51.194  
  51.195  

    52.1 --- a/src/share/vm/classfile/vmSymbols.hpp	Wed Dec 23 03:12:16 2009 -0800
    52.2 +++ b/src/share/vm/classfile/vmSymbols.hpp	Wed Jan 06 22:21:39 2010 -0800
    52.3 @@ -219,7 +219,7 @@
    52.4    template(base_name,                                 "base")                                     \
    52.5                                                                                                    \
    52.6    /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */                                   \
    52.7 -  template(java_dyn_Dynamic,                          "java/dyn/Dynamic")                         \
    52.8 +  template(java_dyn_InvokeDynamic,                    "java/dyn/InvokeDynamic")                   \
    52.9    template(java_dyn_Linkage,                          "java/dyn/Linkage")                         \
   52.10    template(java_dyn_CallSite,                         "java/dyn/CallSite")                        \
   52.11    template(java_dyn_MethodHandle,                     "java/dyn/MethodHandle")                    \
   52.12 @@ -347,9 +347,14 @@
   52.13                                                                                                    \
   52.14    /* common signatures names */                                                                   \
   52.15    template(void_method_signature,                     "()V")                                      \
   52.16 +  template(void_boolean_signature,                    "()Z")                                      \
   52.17 +  template(void_byte_signature,                       "()B")                                      \
   52.18 +  template(void_char_signature,                       "()C")                                      \
   52.19 +  template(void_short_signature,                      "()S")                                      \
   52.20    template(void_int_signature,                        "()I")                                      \
   52.21    template(void_long_signature,                       "()J")                                      \
   52.22 -  template(void_boolean_signature,                    "()Z")                                      \
   52.23 +  template(void_float_signature,                      "()F")                                      \
   52.24 +  template(void_double_signature,                     "()D")                                      \
   52.25    template(int_void_signature,                        "(I)V")                                     \
   52.26    template(int_int_signature,                         "(I)I")                                     \
   52.27    template(int_bool_signature,                        "(I)Z")                                     \
   52.28 @@ -854,6 +859,46 @@
   52.29                                                                                                                            \
   52.30    do_intrinsic(_invoke,                   java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
   52.31    /*   (symbols invoke_name and invoke_signature defined above) */                                                      \
   52.32 +  do_intrinsic(_checkSpreadArgument,      sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \
   52.33 +   do_name(    checkSpreadArgument_name,       "checkSpreadArgument")                                                   \
   52.34 +   do_name(    checkSpreadArgument_signature,  "(Ljava/lang/Object;I)V")                                                \
   52.35 +                                                                                                                        \
   52.36 +  /* unboxing methods: */                                                                                               \
   52.37 +  do_intrinsic(_booleanValue,             java_lang_Boolean,      booleanValue_name, void_boolean_signature, F_R)       \
   52.38 +   do_name(     booleanValue_name,       "booleanValue")                                                                \
   52.39 +  do_intrinsic(_byteValue,                java_lang_Byte,         byteValue_name, void_byte_signature, F_R)             \
   52.40 +   do_name(     byteValue_name,          "byteValue")                                                                   \
   52.41 +  do_intrinsic(_charValue,                java_lang_Character,    charValue_name, void_char_signature, F_R)             \
   52.42 +   do_name(     charValue_name,          "charValue")                                                                   \
   52.43 +  do_intrinsic(_shortValue,               java_lang_Short,        shortValue_name, void_short_signature, F_R)           \
   52.44 +   do_name(     shortValue_name,         "shortValue")                                                                  \
   52.45 +  do_intrinsic(_intValue,                 java_lang_Integer,      intValue_name, void_int_signature, F_R)               \
   52.46 +   do_name(     intValue_name,           "intValue")                                                                    \
   52.47 +  do_intrinsic(_longValue,                java_lang_Long,         longValue_name, void_long_signature, F_R)             \
   52.48 +   do_name(     longValue_name,          "longValue")                                                                   \
   52.49 +  do_intrinsic(_floatValue,               java_lang_Float,        floatValue_name, void_float_signature, F_R)           \
   52.50 +   do_name(     floatValue_name,         "floatValue")                                                                  \
   52.51 +  do_intrinsic(_doubleValue,              java_lang_Double,       doubleValue_name, void_double_signature, F_R)         \
   52.52 +   do_name(     doubleValue_name,        "doubleValue")                                                                 \
   52.53 +                                                                                                                        \
   52.54 +  /* boxing methods: */                                                                                                 \
   52.55 +   do_name(    valueOf_name,              "valueOf")                                                                    \
   52.56 +  do_intrinsic(_Boolean_valueOf,          java_lang_Boolean,      valueOf_name, Boolean_valueOf_signature, F_S)         \
   52.57 +   do_name(     Boolean_valueOf_signature,                       "(Z)Ljava/lang/Boolean;")                              \
   52.58 +  do_intrinsic(_Byte_valueOf,             java_lang_Byte,         valueOf_name, Byte_valueOf_signature, F_S)            \
   52.59 +   do_name(     Byte_valueOf_signature,                          "(B)Ljava/lang/Byte;")                                 \
   52.60 +  do_intrinsic(_Character_valueOf,        java_lang_Character,    valueOf_name, Character_valueOf_signature, F_S)       \
   52.61 +   do_name(     Character_valueOf_signature,                     "(C)Ljava/lang/Character;")                            \
   52.62 +  do_intrinsic(_Short_valueOf,            java_lang_Short,        valueOf_name, Short_valueOf_signature, F_S)           \
   52.63 +   do_name(     Short_valueOf_signature,                         "(S)Ljava/lang/Short;")                                \
   52.64 +  do_intrinsic(_Integer_valueOf,          java_lang_Integer,      valueOf_name, Integer_valueOf_signature, F_S)         \
   52.65 +   do_name(     Integer_valueOf_signature,                       "(I)Ljava/lang/Integer;")                              \
   52.66 +  do_intrinsic(_Long_valueOf,             java_lang_Long,         valueOf_name, Long_valueOf_signature, F_S)            \
   52.67 +   do_name(     Long_valueOf_signature,                          "(J)Ljava/lang/Long;")                                 \
   52.68 +  do_intrinsic(_Float_valueOf,            java_lang_Float,        valueOf_name, Float_valueOf_signature, F_S)           \
   52.69 +   do_name(     Float_valueOf_signature,                         "(F)Ljava/lang/Float;")                                \
   52.70 +  do_intrinsic(_Double_valueOf,           java_lang_Double,       valueOf_name, Double_valueOf_signature, F_S)          \
   52.71 +   do_name(     Double_valueOf_signature,                        "(D)Ljava/lang/Double;")                               \
   52.72                                                                                                                          \
   52.73      /*end*/
   52.74  
   52.75 @@ -984,7 +1029,12 @@
   52.76      F_Y,                        // !static ?native  synchronized
   52.77      F_RN,                       // !static  native !synchronized
   52.78      F_SN,                       //  static  native !synchronized
   52.79 -    F_RNY                       // !static  native  synchronized
   52.80 +    F_RNY,                      // !static  native  synchronized
   52.81 +
   52.82 +    FLAG_LIMIT
   52.83 +  };
   52.84 +  enum {
   52.85 +    log2_FLAG_LIMIT = 4         // checked by an assert at start-up
   52.86    };
   52.87  
   52.88  public:
   52.89 @@ -996,15 +1046,32 @@
   52.90  
   52.91    static const char* name_at(ID id);
   52.92  
   52.93 +private:
   52.94 +  static ID find_id_impl(vmSymbols::SID holder,
   52.95 +                         vmSymbols::SID name,
   52.96 +                         vmSymbols::SID sig,
   52.97 +                         jshort flags);
   52.98 +
   52.99 +public:
  52.100    // Given a method's class, name, signature, and access flags, report its ID.
  52.101    static ID find_id(vmSymbols::SID holder,
  52.102                      vmSymbols::SID name,
  52.103                      vmSymbols::SID sig,
  52.104 -                    jshort flags);
  52.105 +                    jshort flags) {
  52.106 +    ID id = find_id_impl(holder, name, sig, flags);
  52.107 +#ifdef ASSERT
  52.108 +    // ID _none does not hold the following asserts.
  52.109 +    if (id == _none)  return id;
  52.110 +#endif
  52.111 +    assert(    class_for(id) == holder, "correct id");
  52.112 +    assert(     name_for(id) == name,   "correct id");
  52.113 +    assert(signature_for(id) == sig,    "correct id");
  52.114 +    return id;
  52.115 +  }
  52.116  
  52.117    static void verify_method(ID actual_id, methodOop m) PRODUCT_RETURN;
  52.118  
  52.119 -  // No need for these in the product:
  52.120 +  // Find out the symbols behind an intrinsic:
  52.121    static vmSymbols::SID     class_for(ID id);
  52.122    static vmSymbols::SID      name_for(ID id);
  52.123    static vmSymbols::SID signature_for(ID id);
  52.124 @@ -1014,4 +1081,11 @@
  52.125  
  52.126    // Access to intrinsic methods:
  52.127    static methodOop method_for(ID id);
  52.128 +
  52.129 +  // Wrapper object methods:
  52.130 +  static ID for_boxing(BasicType type);
  52.131 +  static ID for_unboxing(BasicType type);
  52.132 +
  52.133 +  // Raw conversion:
  52.134 +  static ID for_raw_conversion(BasicType src, BasicType dest);
  52.135  };

    53.1 --- a/src/share/vm/code/codeBlob.hpp	Wed Dec 23 03:12:16 2009 -0800
    53.2 +++ b/src/share/vm/code/codeBlob.hpp	Wed Jan 06 22:21:39 2010 -0800
    53.3 @@ -1,5 +1,5 @@
    53.4  /*
    53.5 - * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
    53.6 + * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
    53.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.8   *
    53.9   * This code is free software; you can redistribute it and/or modify it
   53.10 @@ -102,6 +102,9 @@
   53.11    virtual bool is_compiled_by_c2() const         { return false; }
   53.12    virtual bool is_compiled_by_c1() const         { return false; }
   53.13  
   53.14 +  // Casting
   53.15 +  nmethod* as_nmethod_or_null()                  { return is_nmethod() ? (nmethod*) this : NULL; }
   53.16 +
   53.17    // Boundaries
   53.18    address    header_begin() const                { return (address)    this; }
   53.19    address    header_end() const                  { return ((address)   this) + _header_size; };

    54.1 --- a/src/share/vm/code/debugInfoRec.cpp	Wed Dec 23 03:12:16 2009 -0800
    54.2 +++ b/src/share/vm/code/debugInfoRec.cpp	Wed Jan 06 22:21:39 2010 -0800
    54.3 @@ -281,6 +281,7 @@
    54.4                                                ciMethod*   method,
    54.5                                                int         bci,
    54.6                                                bool        reexecute,
    54.7 +                                              bool        is_method_handle_invoke,
    54.8                                                DebugToken* locals,
    54.9                                                DebugToken* expressions,
   54.10                                                DebugToken* monitors) {
   54.11 @@ -292,8 +293,9 @@
   54.12    int stream_offset = stream()->position();
   54.13    last_pd->set_scope_decode_offset(stream_offset);
   54.14  
   54.15 -  // Record reexecute bit into pcDesc
   54.16 +  // Record flags into pcDesc.
   54.17    last_pd->set_should_reexecute(reexecute);
   54.18 +  last_pd->set_is_method_handle_invoke(is_method_handle_invoke);
   54.19  
   54.20    // serialize sender stream offest
   54.21    stream()->write_int(sender_stream_offset);

    55.1 --- a/src/share/vm/code/debugInfoRec.hpp	Wed Dec 23 03:12:16 2009 -0800
    55.2 +++ b/src/share/vm/code/debugInfoRec.hpp	Wed Jan 06 22:21:39 2010 -0800
    55.3 @@ -88,6 +88,7 @@
    55.4                        ciMethod*   method,
    55.5                        int         bci,
    55.6                        bool        reexecute,
    55.7 +                      bool        is_method_handle_invoke = false,
    55.8                        DebugToken* locals      = NULL,
    55.9                        DebugToken* expressions = NULL,
   55.10                        DebugToken* monitors    = NULL);

    56.1 --- a/src/share/vm/code/nmethod.cpp	Wed Dec 23 03:12:16 2009 -0800
    56.2 +++ b/src/share/vm/code/nmethod.cpp	Wed Jan 06 22:21:39 2010 -0800
    56.3 @@ -1170,7 +1170,7 @@
    56.4  }
    56.5  
    56.6  // Common functionality for both make_not_entrant and make_zombie
    56.7 -bool nmethod::make_not_entrant_or_zombie(int state) {
    56.8 +bool nmethod::make_not_entrant_or_zombie(unsigned int state) {
    56.9    assert(state == zombie || state == not_entrant, "must be zombie or not_entrant");
   56.10  
   56.11    // If the method is already zombie there is nothing to do
   56.12 @@ -1724,9 +1724,9 @@
   56.13    if (!method()->is_native()) {
   56.14      SimpleScopeDesc ssd(this, fr.pc());
   56.15      Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
   56.16 -    bool is_static = call->is_invokestatic();
   56.17 +    bool has_receiver = call->has_receiver();
   56.18      symbolOop signature = call->signature();
   56.19 -    fr.oops_compiled_arguments_do(signature, is_static, reg_map, f);
   56.20 +    fr.oops_compiled_arguments_do(signature, has_receiver, reg_map, f);
   56.21    }
   56.22  }
   56.23  
   56.24 @@ -1763,6 +1763,14 @@
   56.25           "must end with a sentinel");
   56.26  #endif //ASSERT
   56.27  
   56.28 +  // Search for MethodHandle invokes and tag the nmethod.
   56.29 +  for (int i = 0; i < count; i++) {
   56.30 +    if (pcs[i].is_method_handle_invoke()) {
   56.31 +      set_has_method_handle_invokes(true);
   56.32 +      break;
   56.33 +    }
   56.34 +  }
   56.35 +
   56.36    int size = count * sizeof(PcDesc);
   56.37    assert(scopes_pcs_size() >= size, "oob");
   56.38    memcpy(scopes_pcs_begin(), pcs, size);
   56.39 @@ -2030,6 +2038,18 @@
   56.40  
   56.41  
   56.42  // -----------------------------------------------------------------------------
   56.43 +// MethodHandle
   56.44 +
   56.45 +bool nmethod::is_method_handle_return(address return_pc) {
   56.46 +  if (!has_method_handle_invokes())  return false;
   56.47 +  PcDesc* pd = pc_desc_at(return_pc);
   56.48 +  if (pd == NULL)
   56.49 +    return false;
   56.50 +  return pd->is_method_handle_invoke();
   56.51 +}
   56.52 +
   56.53 +
   56.54 +// -----------------------------------------------------------------------------
   56.55  // Verification
   56.56  
   56.57  class VerifyOopsClosure: public OopClosure {

    57.1 --- a/src/share/vm/code/nmethod.hpp	Wed Dec 23 03:12:16 2009 -0800
    57.2 +++ b/src/share/vm/code/nmethod.hpp	Wed Jan 06 22:21:39 2010 -0800
    57.3 @@ -81,18 +81,19 @@
    57.4  
    57.5  struct nmFlags {
    57.6    friend class VMStructs;
    57.7 -  unsigned int version:8;                 // version number (0 = first version)
    57.8 -  unsigned int level:4;                   // optimization level
    57.9 -  unsigned int age:4;                     // age (in # of sweep steps)
   57.10 +  unsigned int version:8;                    // version number (0 = first version)
   57.11 +  unsigned int level:4;                      // optimization level
   57.12 +  unsigned int age:4;                        // age (in # of sweep steps)
   57.13  
   57.14 -  unsigned int state:2;                   // {alive, zombie, unloaded)
   57.15 +  unsigned int state:2;                      // {alive, zombie, unloaded)
   57.16  
   57.17 -  unsigned int isUncommonRecompiled:1;    // recompiled because of uncommon trap?
   57.18 -  unsigned int isToBeRecompiled:1;        // to be recompiled as soon as it matures
   57.19 -  unsigned int hasFlushedDependencies:1;  // Used for maintenance of dependencies
   57.20 -  unsigned int markedForReclamation:1;    // Used by NMethodSweeper
   57.21 +  unsigned int isUncommonRecompiled:1;       // recompiled because of uncommon trap?
   57.22 +  unsigned int isToBeRecompiled:1;           // to be recompiled as soon as it matures
   57.23 +  unsigned int hasFlushedDependencies:1;     // Used for maintenance of dependencies
   57.24 +  unsigned int markedForReclamation:1;       // Used by NMethodSweeper
   57.25  
   57.26 -  unsigned int has_unsafe_access:1;       // May fault due to unsafe access.
   57.27 +  unsigned int has_unsafe_access:1;          // May fault due to unsafe access.
   57.28 +  unsigned int has_method_handle_invokes:1;  // Has this method MethodHandle invokes?
   57.29  
   57.30    void clear();
   57.31  };
   57.32 @@ -254,7 +255,7 @@
   57.33    const char* reloc_string_for(u_char* begin, u_char* end);
   57.34    // Returns true if this thread changed the state of the nmethod or
   57.35    // false if another thread performed the transition.
   57.36 -  bool make_not_entrant_or_zombie(int state);
   57.37 +  bool make_not_entrant_or_zombie(unsigned int state);
   57.38    void inc_decompile_count();
   57.39  
   57.40    // used to check that writes to nmFlags are done consistently.
   57.41 @@ -409,6 +410,9 @@
   57.42    bool  has_unsafe_access() const                 { return flags.has_unsafe_access; }
   57.43    void  set_has_unsafe_access(bool z)             { flags.has_unsafe_access = z; }
   57.44  
   57.45 +  bool  has_method_handle_invokes() const         { return flags.has_method_handle_invokes; }
   57.46 +  void  set_has_method_handle_invokes(bool z)     { flags.has_method_handle_invokes = z; }
   57.47 +
   57.48    int   level() const                             { return flags.level; }
   57.49    void  set_level(int newLevel)                   { check_safepoint(); flags.level = newLevel; }
   57.50  
   57.51 @@ -541,6 +545,9 @@
   57.52    address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
   57.53    void    set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
   57.54  
   57.55 +  // MethodHandle
   57.56 +  bool is_method_handle_return(address return_pc);
   57.57 +
   57.58    // jvmti support:
   57.59    void post_compiled_method_load_event();
   57.60  

    58.1 --- a/src/share/vm/code/pcDesc.hpp	Wed Dec 23 03:12:16 2009 -0800
    58.2 +++ b/src/share/vm/code/pcDesc.hpp	Wed Jan 06 22:21:39 2010 -0800
    58.3 @@ -38,6 +38,7 @@
    58.4      int word;
    58.5      struct {
    58.6        unsigned int reexecute: 1;
    58.7 +      unsigned int is_method_handle_invoke: 1;
    58.8      } bits;
    58.9      bool operator ==(const PcDescFlags& other) { return word == other.word; }
   58.10    } _flags;
   58.11 @@ -72,6 +73,9 @@
   58.12        _flags == pd->_flags;
   58.13    }
   58.14  
   58.15 +  bool     is_method_handle_invoke()       const { return _flags.bits.is_method_handle_invoke;     }
   58.16 +  void set_is_method_handle_invoke(bool z)       {        _flags.bits.is_method_handle_invoke = z; }
   58.17 +
   58.18    // Returns the real pc
   58.19    address real_pc(const nmethod* code) const;
   58.20  

    59.1 --- a/src/share/vm/compiler/compileBroker.cpp	Wed Dec 23 03:12:16 2009 -0800
    59.2 +++ b/src/share/vm/compiler/compileBroker.cpp	Wed Jan 06 22:21:39 2010 -0800
    59.3 @@ -1820,9 +1820,11 @@
    59.4                  CompileBroker::_t_standard_compilation.seconds(),
    59.5                  CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
    59.6    tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
    59.7 -  compiler(CompLevel_fast_compile)->print_timers();
    59.8 -  if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
    59.9 -    compiler(CompLevel_highest_tier)->print_timers();
   59.10 +
   59.11 +  if (compiler(CompLevel_fast_compile)) {
   59.12 +    compiler(CompLevel_fast_compile)->print_timers();
   59.13 +    if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
   59.14 +      compiler(CompLevel_highest_tier)->print_timers();
   59.15    }
   59.16  
   59.17    tty->cr();

    60.1 --- a/src/share/vm/compiler/methodLiveness.cpp	Wed Dec 23 03:12:16 2009 -0800
    60.2 +++ b/src/share/vm/compiler/methodLiveness.cpp	Wed Jan 06 22:21:39 2010 -0800
    60.3 @@ -782,6 +782,7 @@
    60.4      case Bytecodes::_invokespecial:
    60.5      case Bytecodes::_invokestatic:
    60.6      case Bytecodes::_invokeinterface:
    60.7 +    case Bytecodes::_invokedynamic:
    60.8      case Bytecodes::_newarray:
    60.9      case Bytecodes::_anewarray:
   60.10      case Bytecodes::_checkcast:

    61.1 --- a/src/share/vm/gc_interface/collectedHeap.cpp	Wed Dec 23 03:12:16 2009 -0800
    61.2 +++ b/src/share/vm/gc_interface/collectedHeap.cpp	Wed Jan 06 22:21:39 2010 -0800
    61.3 @@ -274,7 +274,7 @@
    61.4      fill_with_array(start, words);
    61.5    } else if (words > 0) {
    61.6      assert(words == min_fill_size(), "unaligned size");
    61.7 -    post_allocation_setup_common(SystemDictionary::object_klass(), start,
    61.8 +    post_allocation_setup_common(SystemDictionary::Object_klass(), start,
    61.9                                   words);
   61.10    }
   61.11  }

    62.1 --- a/src/share/vm/includeDB_compiler2	Wed Dec 23 03:12:16 2009 -0800
    62.2 +++ b/src/share/vm/includeDB_compiler2	Wed Jan 06 22:21:39 2010 -0800
    62.3 @@ -155,6 +155,9 @@
    62.4  callGenerator.cpp                       cfgnode.hpp
    62.5  callGenerator.cpp                       compileLog.hpp
    62.6  callGenerator.cpp                       connode.hpp
    62.7 +callGenerator.cpp                       ciCPCache.hpp
    62.8 +callGenerator.cpp                       ciMethodHandle.hpp
    62.9 +callGenerator.cpp                       javaClasses.hpp
   62.10  callGenerator.cpp                       parse.hpp
   62.11  callGenerator.cpp                       rootnode.hpp
   62.12  callGenerator.cpp                       runtime.hpp
   62.13 @@ -391,6 +394,9 @@
   62.14  
   62.15  doCall.cpp                              addnode.hpp
   62.16  doCall.cpp                              callGenerator.hpp
   62.17 +doCall.cpp                              ciCallSite.hpp
   62.18 +doCall.cpp                              ciCPCache.hpp
   62.19 +doCall.cpp                              ciMethodHandle.hpp
   62.20  doCall.cpp                              cfgnode.hpp
   62.21  doCall.cpp                              compileLog.hpp
   62.22  doCall.cpp                              linkResolver.hpp

    63.1 --- a/src/share/vm/includeDB_core	Wed Dec 23 03:12:16 2009 -0800
    63.2 +++ b/src/share/vm/includeDB_core	Wed Jan 06 22:21:39 2010 -0800
    63.3 @@ -516,6 +516,11 @@
    63.4  
    63.5  ciCallProfile.hpp                       ciClassList.hpp
    63.6  
    63.7 +ciCallSite.cpp                          ciCallSite.hpp
    63.8 +ciCallSite.cpp                          ciUtilities.hpp
    63.9 +
   63.10 +ciCallSite.hpp                          ciInstance.hpp
   63.11 +
   63.12  ciConstant.cpp                          allocation.hpp
   63.13  ciConstant.cpp                          allocation.inline.hpp
   63.14  ciConstant.cpp                          ciConstant.hpp
   63.15 @@ -532,6 +537,12 @@
   63.16  ciConstantPoolCache.hpp                 growableArray.hpp
   63.17  ciConstantPoolCache.hpp                 resourceArea.hpp
   63.18  
   63.19 +ciCPCache.cpp                           cpCacheOop.hpp
   63.20 +ciCPCache.cpp                           ciCPCache.hpp
   63.21 +
   63.22 +ciCPCache.hpp                           ciClassList.hpp
   63.23 +ciCPCache.hpp                           ciObject.hpp
   63.24 +
   63.25  ciEnv.cpp                               allocation.inline.hpp
   63.26  ciEnv.cpp                               ciConstant.hpp
   63.27  ciEnv.cpp                               ciEnv.hpp
   63.28 @@ -593,6 +604,7 @@
   63.29  ciField.hpp                             ciClassList.hpp
   63.30  ciField.hpp                             ciConstant.hpp
   63.31  ciField.hpp                             ciFlags.hpp
   63.32 +ciField.hpp                             ciInstance.hpp
   63.33  
   63.34  ciFlags.cpp                             ciFlags.hpp
   63.35  
   63.36 @@ -679,6 +691,7 @@
   63.37  ciMethod.hpp                            ciInstanceKlass.hpp
   63.38  ciMethod.hpp                            ciObject.hpp
   63.39  ciMethod.hpp                            ciSignature.hpp
   63.40 +ciMethod.hpp                            methodHandles.hpp
   63.41  ciMethod.hpp                            methodLiveness.hpp
   63.42  
   63.43  ciMethodBlocks.cpp                      bytecode.hpp
   63.44 @@ -710,6 +723,15 @@
   63.45  ciMethodKlass.hpp                       ciKlass.hpp
   63.46  ciMethodKlass.hpp                       ciSymbol.hpp
   63.47  
   63.48 +ciMethodHandle.cpp                      ciClassList.hpp
   63.49 +ciMethodHandle.cpp                      ciInstance.hpp
   63.50 +ciMethodHandle.cpp                      ciMethodHandle.hpp
   63.51 +ciMethodHandle.cpp                      ciUtilities.hpp
   63.52 +ciMethodHandle.cpp                      methodHandles.hpp
   63.53 +ciMethodHandle.cpp                      methodHandleWalk.hpp
   63.54 +
   63.55 +ciMethodHandle.hpp                      methodHandles.hpp
   63.56 +
   63.57  ciNullObject.cpp                        ciNullObject.hpp
   63.58  
   63.59  ciNullObject.hpp                        ciClassList.hpp
   63.60 @@ -755,11 +777,14 @@
   63.61  ciObject.hpp                            jniHandles.hpp
   63.62  
   63.63  ciObjectFactory.cpp                     allocation.inline.hpp
   63.64 +ciObjectFactory.cpp                     ciCallSite.hpp
   63.65 +ciObjectFactory.cpp                     ciCPCache.hpp
   63.66  ciObjectFactory.cpp                     ciInstance.hpp
   63.67  ciObjectFactory.cpp                     ciInstanceKlass.hpp
   63.68  ciObjectFactory.cpp                     ciInstanceKlassKlass.hpp
   63.69  ciObjectFactory.cpp                     ciMethod.hpp
   63.70  ciObjectFactory.cpp                     ciMethodData.hpp
   63.71 +ciObjectFactory.cpp                     ciMethodHandle.hpp
   63.72  ciObjectFactory.cpp                     ciMethodKlass.hpp
   63.73  ciObjectFactory.cpp                     ciNullObject.hpp
   63.74  ciObjectFactory.cpp                     ciObjArray.hpp
   63.75 @@ -793,6 +818,7 @@
   63.76  ciSignature.hpp                         globalDefinitions.hpp
   63.77  ciSignature.hpp                         growableArray.hpp
   63.78  
   63.79 +ciStreams.cpp                           ciCallSite.hpp
   63.80  ciStreams.cpp                           ciConstant.hpp
   63.81  ciStreams.cpp                           ciField.hpp
   63.82  ciStreams.cpp                           ciStreams.hpp
   63.83 @@ -2814,6 +2840,12 @@
   63.84  methodDataOop.hpp                       orderAccess.hpp
   63.85  methodDataOop.hpp                       universe.hpp
   63.86  
   63.87 +methodHandleWalk.hpp                    methodHandles.hpp
   63.88 +
   63.89 +methodHandleWalk.cpp                    methodHandleWalk.hpp
   63.90 +methodHandleWalk.cpp                    oopFactory.hpp
   63.91 +methodHandleWalk.cpp                    rewriter.hpp
   63.92 +
   63.93  methodHandles.hpp                       frame.inline.hpp
   63.94  methodHandles.hpp                       globals.hpp
   63.95  methodHandles.hpp                       interfaceSupport.hpp

    64.1 --- a/src/share/vm/interpreter/bytecode.cpp	Wed Dec 23 03:12:16 2009 -0800
    64.2 +++ b/src/share/vm/interpreter/bytecode.cpp	Wed Jan 06 22:21:39 2010 -0800
    64.3 @@ -102,7 +102,9 @@
    64.4    KlassHandle resolved_klass;
    64.5    constantPoolHandle constants(THREAD, _method->constants());
    64.6  
    64.7 -  if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
    64.8 +  if (adjusted_invoke_code() == Bytecodes::_invokedynamic) {
    64.9 +    LinkResolver::resolve_dynamic_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
   64.10 +  } else if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
   64.11      LinkResolver::resolve_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
   64.12    } else {
   64.13      LinkResolver::resolve_interface_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));

    65.1 --- a/src/share/vm/interpreter/bytecode.hpp	Wed Dec 23 03:12:16 2009 -0800
    65.2 +++ b/src/share/vm/interpreter/bytecode.hpp	Wed Jan 06 22:21:39 2010 -0800
    65.3 @@ -205,12 +205,14 @@
    65.4    bool is_invokespecial() const                  { return adjusted_invoke_code() == Bytecodes::_invokespecial; }
    65.5    bool is_invokedynamic() const                  { return adjusted_invoke_code() == Bytecodes::_invokedynamic; }
    65.6  
    65.7 +  bool has_receiver() const                      { return !is_invokestatic() && !is_invokedynamic(); }
    65.8    bool has_giant_index() const                   { return is_invokedynamic(); }
    65.9  
   65.10    bool is_valid() const                          { return is_invokeinterface() ||
   65.11                                                            is_invokevirtual()   ||
   65.12                                                            is_invokestatic()    ||
   65.13 -                                                          is_invokespecial();     }
   65.14 +                                                          is_invokespecial()   ||
   65.15 +                                                          is_invokedynamic(); }
   65.16  
   65.17    // Creation
   65.18    inline friend Bytecode_invoke* Bytecode_invoke_at(methodHandle method, int bci);

    66.1 --- a/src/share/vm/interpreter/bytecodeTracer.cpp	Wed Dec 23 03:12:16 2009 -0800
    66.2 +++ b/src/share/vm/interpreter/bytecodeTracer.cpp	Wed Jan 06 22:21:39 2010 -0800
    66.3 @@ -270,6 +270,8 @@
    66.4      st->print_cr(" %s", constants->resolved_klass_at(i)->klass_part()->external_name());
    66.5    } else if (tag.is_unresolved_klass()) {
    66.6      st->print_cr(" <unresolved klass at %d>", i);
    66.7 +  } else if (tag.is_object()) {
    66.8 +    st->print_cr(" " PTR_FORMAT, constants->object_at(i));
    66.9    } else {
   66.10      st->print_cr(" bad tag=%d at %d", tag.value(), i);
   66.11    }

    67.1 --- a/src/share/vm/interpreter/bytecodes.cpp	Wed Dec 23 03:12:16 2009 -0800
    67.2 +++ b/src/share/vm/interpreter/bytecodes.cpp	Wed Jan 06 22:21:39 2010 -0800
    67.3 @@ -357,7 +357,7 @@
    67.4    def(_invokespecial       , "invokespecial"       , "bjj"  , NULL    , T_ILLEGAL, -1, true);
    67.5    def(_invokestatic        , "invokestatic"        , "bjj"  , NULL    , T_ILLEGAL,  0, true);
    67.6    def(_invokeinterface     , "invokeinterface"     , "bjj__", NULL    , T_ILLEGAL, -1, true);
    67.7 -  def(_invokedynamic       , "invokedynamic"       , "bjjjj", NULL    , T_ILLEGAL, -1, true );
    67.8 +  def(_invokedynamic       , "invokedynamic"       , "bjjjj", NULL    , T_ILLEGAL,  0, true );
    67.9    def(_new                 , "new"                 , "bii"  , NULL    , T_OBJECT ,  1, true );
   67.10    def(_newarray            , "newarray"            , "bc"   , NULL    , T_OBJECT ,  0, true );
   67.11    def(_anewarray           , "anewarray"           , "bii"  , NULL    , T_OBJECT ,  0, true );

    68.1 --- a/src/share/vm/interpreter/interpreter.cpp	Wed Dec 23 03:12:16 2009 -0800
    68.2 +++ b/src/share/vm/interpreter/interpreter.cpp	Wed Jan 06 22:21:39 2010 -0800
    68.3 @@ -323,7 +323,7 @@
    68.4        // (NOT needed for the old calling convension)
    68.5        if (!is_top_frame) {
    68.6          int index = Bytes::get_native_u4(bcp+1);
    68.7 -        method->constants()->cache()->entry_at(index)->set_parameter_size(callee_parameters);
    68.8 +        method->constants()->cache()->secondary_entry_at(index)->set_parameter_size(callee_parameters);
    68.9        }
   68.10        break;
   68.11      }

    69.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Dec 23 03:12:16 2009 -0800
    69.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Jan 06 22:21:39 2010 -0800
    69.3 @@ -353,7 +353,7 @@
    69.4      assert(h_exception.not_null(), "NULL exceptions should be handled by athrow");
    69.5      assert(h_exception->is_oop(), "just checking");
    69.6      // Check that exception is a subclass of Throwable, otherwise we have a VerifyError
    69.7 -    if (!(h_exception->is_a(SystemDictionary::throwable_klass()))) {
    69.8 +    if (!(h_exception->is_a(SystemDictionary::Throwable_klass()))) {
    69.9        if (ExitVMOnVerifyError) vm_exit(-1);
   69.10        ShouldNotReachHere();
   69.11      }
   69.12 @@ -585,7 +585,7 @@
   69.13    Handle exception(thread, thread->vm_result());
   69.14    assert(exception() != NULL, "vm result should be set");
   69.15    thread->set_vm_result(NULL); // clear vm result before continuing (may cause memory leaks and assert failures)
   69.16 -  if (!exception->is_a(SystemDictionary::threaddeath_klass())) {
   69.17 +  if (!exception->is_a(SystemDictionary::ThreadDeath_klass())) {
   69.18      exception = get_preinitialized_exception(
   69.19                         SystemDictionary::IllegalMonitorStateException_klass(),
   69.20                         CATCH);
   69.21 @@ -660,7 +660,7 @@
   69.22        tty->print_cr("Resolving: klass: %s to method: %s", info.resolved_klass()->name()->as_C_string(), info.resolved_method()->name()->as_C_string());
   69.23      }
   69.24      if (info.resolved_method()->method_holder() ==
   69.25 -                                            SystemDictionary::object_klass()) {
   69.26 +                                            SystemDictionary::Object_klass()) {
   69.27        // NOTE: THIS IS A FIX FOR A CORNER CASE in the JVM spec
   69.28        // (see also cpCacheOop.cpp for details)
   69.29        methodHandle rm = info.resolved_method();
   69.30 @@ -1250,7 +1250,7 @@
   69.31    methodHandle mh(thread, fr.interpreter_frame_method());
   69.32    Bytecode_invoke* invoke = Bytecode_invoke_at(mh, bci);
   69.33    ArgumentSizeComputer asc(invoke->signature());
   69.34 -  int size_of_arguments = (asc.size() + (invoke->is_invokestatic() ? 0 : 1)); // receiver
   69.35 +  int size_of_arguments = (asc.size() + (invoke->has_receiver() ? 1 : 0)); // receiver
   69.36    Copy::conjoint_bytes(src_address, dest_address,
   69.37                         size_of_arguments * Interpreter::stackElementSize());
   69.38  IRT_END

    70.1 --- a/src/share/vm/interpreter/linkResolver.cpp	Wed Dec 23 03:12:16 2009 -0800
    70.2 +++ b/src/share/vm/interpreter/linkResolver.cpp	Wed Jan 06 22:21:39 2010 -0800
    70.3 @@ -55,7 +55,7 @@
    70.4    // we should pick the vtable index from the resolved method.
    70.5    // Other than that case, there is no valid vtable index to specify.
    70.6    int vtable_index = methodOopDesc::invalid_vtable_index;
    70.7 -  if (resolved_method->method_holder() == SystemDictionary::object_klass()) {
    70.8 +  if (resolved_method->method_holder() == SystemDictionary::Object_klass()) {
    70.9      assert(resolved_method->vtable_index() == selected_method->vtable_index(), "sanity check");
   70.10      vtable_index = resolved_method->vtable_index();
   70.11    }
   70.12 @@ -75,6 +75,8 @@
   70.13    _selected_method = selected_method;
   70.14    _vtable_index    = vtable_index;
   70.15    if (CompilationPolicy::mustBeCompiled(selected_method)) {
   70.16 +    // This path is unusual, mostly used by the '-Xcomp' stress test mode.
   70.17 +
   70.18      // Note: with several active threads, the mustBeCompiled may be true
   70.19      //       while canBeCompiled is false; remove assert
   70.20      // assert(CompilationPolicy::canBeCompiled(selected_method), "cannot compile");
   70.21 @@ -82,6 +84,16 @@
   70.22        // don't force compilation, resolve was on behalf of compiler
   70.23        return;
   70.24      }
   70.25 +    if (instanceKlass::cast(selected_method->method_holder())->is_not_initialized()) {
   70.26 +      // 'is_not_initialized' means not only '!is_initialized', but also that
   70.27 +      // initialization has not been started yet ('!being_initialized')
   70.28 +      // Do not force compilation of methods in uninitialized classes.
   70.29 +      // Note that doing this would throw an assert later,
   70.30 +      // in CompileBroker::compile_method.
   70.31 +      // We sometimes use the link resolver to do reflective lookups
   70.32 +      // even before classes are initialized.
   70.33 +      return;
   70.34 +    }
   70.35      CompileBroker::compile_method(selected_method, InvocationEntryBci,
   70.36                                    methodHandle(), 0, "mustBeCompiled", CHECK);
   70.37    }
   70.38 @@ -181,7 +193,7 @@
   70.39    // We'll check for the method name first, as that's most likely
   70.40    // to be false (so we'll short-circuit out of these tests).
   70.41    if (sel_method->name() == vmSymbols::clone_name() &&
   70.42 -      sel_klass() == SystemDictionary::object_klass() &&
   70.43 +      sel_klass() == SystemDictionary::Object_klass() &&
   70.44        resolved_klass->oop_is_array()) {
   70.45      // We need to change "protected" to "public".
   70.46      assert(flags.is_protected(), "clone not protected?");
   70.47 @@ -223,6 +235,18 @@
   70.48    resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
   70.49  }
   70.50  
   70.51 +void LinkResolver::resolve_dynamic_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
   70.52 +  // The class is java.dyn.MethodHandle
   70.53 +  resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
   70.54 +
   70.55 +  symbolHandle method_name = vmSymbolHandles::invoke_name();
   70.56 +
   70.57 +  symbolHandle method_signature(THREAD, pool->signature_ref_at(index));
   70.58 +  KlassHandle  current_klass   (THREAD, pool->pool_holder());
   70.59 +
   70.60 +  resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
   70.61 +}
   70.62 +
   70.63  void LinkResolver::resolve_interface_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
   70.64  
   70.65    // resolve klass

    71.1 --- a/src/share/vm/interpreter/linkResolver.hpp	Wed Dec 23 03:12:16 2009 -0800
    71.2 +++ b/src/share/vm/interpreter/linkResolver.hpp	Wed Jan 06 22:21:39 2010 -0800
    71.3 @@ -133,6 +133,7 @@
    71.4  
    71.5    // static resolving for all calls except interface calls
    71.6    static void resolve_method          (methodHandle& method_result, KlassHandle& klass_result, constantPoolHandle pool, int index, TRAPS);
    71.7 +  static void resolve_dynamic_method  (methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS);
    71.8    static void resolve_interface_method(methodHandle& method_result, KlassHandle& klass_result, constantPoolHandle pool, int index, TRAPS);
    71.9  
   71.10    // runtime/static resolving for fields

    72.1 --- a/src/share/vm/interpreter/rewriter.cpp	Wed Dec 23 03:12:16 2009 -0800
    72.2 +++ b/src/share/vm/interpreter/rewriter.cpp	Wed Jan 06 22:21:39 2010 -0800
    72.3 @@ -247,15 +247,22 @@
    72.4  
    72.5  void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) {
    72.6    ResourceMark rm(THREAD);
    72.7 -  Rewriter     rw(klass, CHECK);
    72.8 +  Rewriter     rw(klass, klass->constants(), klass->methods(), CHECK);
    72.9    // (That's all, folks.)
   72.10  }
   72.11  
   72.12 -Rewriter::Rewriter(instanceKlassHandle klass, TRAPS)
   72.13 +
   72.14 +void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) {
   72.15 +  ResourceMark rm(THREAD);
   72.16 +  Rewriter     rw(klass, cpool, methods, CHECK);
   72.17 +  // (That's all, folks.)
   72.18 +}
   72.19 +
   72.20 +
   72.21 +Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS)
   72.22    : _klass(klass),
   72.23 -    // gather starting points
   72.24 -    _pool(   THREAD, klass->constants()),
   72.25 -    _methods(THREAD, klass->methods())
   72.26 +    _pool(cpool),
   72.27 +    _methods(methods)
   72.28  {
   72.29    assert(_pool->cache() == NULL, "constant pool cache must not be set yet");
   72.30  

    73.1 --- a/src/share/vm/interpreter/rewriter.hpp	Wed Dec 23 03:12:16 2009 -0800
    73.2 +++ b/src/share/vm/interpreter/rewriter.hpp	Wed Jan 06 22:21:39 2010 -0800
    73.3 @@ -57,7 +57,7 @@
    73.4    }
    73.5  
    73.6    // All the work goes in here:
    73.7 -  Rewriter(instanceKlassHandle klass, TRAPS);
    73.8 +  Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
    73.9  
   73.10    void compute_index_maps();
   73.11    void make_constant_pool_cache(TRAPS);
   73.12 @@ -70,6 +70,7 @@
   73.13   public:
   73.14    // Driver routine:
   73.15    static void rewrite(instanceKlassHandle klass, TRAPS);
   73.16 +  static void rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
   73.17  
   73.18    enum {
   73.19      _secondary_entry_tag = nth_bit(30)

    74.1 --- a/src/share/vm/memory/classify.cpp	Wed Dec 23 03:12:16 2009 -0800
    74.2 +++ b/src/share/vm/memory/classify.cpp	Wed Jan 06 22:21:39 2010 -0800
    74.3 @@ -49,7 +49,7 @@
    74.4  
    74.5    Klass* k = obj->blueprint();
    74.6  
    74.7 -  if (k->as_klassOop() == SystemDictionary::object_klass()) {
    74.8 +  if (k->as_klassOop() == SystemDictionary::Object_klass()) {
    74.9      tty->print_cr("Found the class!");
   74.10    }
   74.11  

    75.1 --- a/src/share/vm/memory/dump.cpp	Wed Dec 23 03:12:16 2009 -0800
    75.2 +++ b/src/share/vm/memory/dump.cpp	Wed Jan 06 22:21:39 2010 -0800
    75.3 @@ -63,7 +63,7 @@
    75.4    void do_oop(oop* p) {
    75.5      if (p != NULL) {
    75.6        oop obj = *p;
    75.7 -      if (obj->klass() == SystemDictionary::string_klass()) {
    75.8 +      if (obj->klass() == SystemDictionary::String_klass()) {
    75.9  
   75.10          int hash;
   75.11          typeArrayOop value = java_lang_String::value(obj);
   75.12 @@ -625,11 +625,11 @@
   75.13  
   75.14      if (obj->is_klass() || obj->is_instance()) {
   75.15        if (obj->is_klass() ||
   75.16 -          obj->is_a(SystemDictionary::class_klass()) ||
   75.17 -          obj->is_a(SystemDictionary::throwable_klass())) {
   75.18 +          obj->is_a(SystemDictionary::Class_klass()) ||
   75.19 +          obj->is_a(SystemDictionary::Throwable_klass())) {
   75.20          // Do nothing
   75.21        }
   75.22 -      else if (obj->is_a(SystemDictionary::string_klass())) {
   75.23 +      else if (obj->is_a(SystemDictionary::String_klass())) {
   75.24          // immutable objects.
   75.25        } else {
   75.26          // someone added an object we hadn't accounted for.

    76.1 --- a/src/share/vm/memory/referenceProcessor.cpp	Wed Dec 23 03:12:16 2009 -0800
    76.2 +++ b/src/share/vm/memory/referenceProcessor.cpp	Wed Jan 06 22:21:39 2010 -0800
    76.3 @@ -71,7 +71,7 @@
    76.4    assert(_sentinelRef == NULL, "should be initialized precisely once");
    76.5    EXCEPTION_MARK;
    76.6    _sentinelRef = instanceKlass::cast(
    76.7 -                    SystemDictionary::reference_klass())->
    76.8 +                    SystemDictionary::Reference_klass())->
    76.9                        allocate_permanent_instance(THREAD);
   76.10  
   76.11    // Initialize the master soft ref clock.

    77.1 --- a/src/share/vm/memory/space.cpp	Wed Dec 23 03:12:16 2009 -0800
    77.2 +++ b/src/share/vm/memory/space.cpp	Wed Jan 06 22:21:39 2010 -0800
    77.3 @@ -876,7 +876,7 @@
    77.4      instanceOop obj = (instanceOop) allocate(size);
    77.5      obj->set_mark(markOopDesc::prototype());
    77.6      obj->set_klass_gap(0);
    77.7 -    obj->set_klass(SystemDictionary::object_klass());
    77.8 +    obj->set_klass(SystemDictionary::Object_klass());
    77.9    }
   77.10  }
   77.11  

    78.1 --- a/src/share/vm/memory/universe.cpp	Wed Dec 23 03:12:16 2009 -0800
    78.2 +++ b/src/share/vm/memory/universe.cpp	Wed Jan 06 22:21:39 2010 -0800
    78.3 @@ -291,7 +291,7 @@
    78.4  
    78.5      SystemDictionary::initialize(CHECK);
    78.6  
    78.7 -    klassOop ok = SystemDictionary::object_klass();
    78.8 +    klassOop ok = SystemDictionary::Object_klass();
    78.9  
   78.10      _the_null_string            = StringTable::intern("null", CHECK);
   78.11      _the_min_jint_string       = StringTable::intern("-2147483648", CHECK);
   78.12 @@ -299,9 +299,9 @@
   78.13      if (UseSharedSpaces) {
   78.14        // Verify shared interfaces array.
   78.15        assert(_the_array_interfaces_array->obj_at(0) ==
   78.16 -             SystemDictionary::cloneable_klass(), "u3");
   78.17 +             SystemDictionary::Cloneable_klass(), "u3");
   78.18        assert(_the_array_interfaces_array->obj_at(1) ==
   78.19 -             SystemDictionary::serializable_klass(), "u3");
   78.20 +             SystemDictionary::Serializable_klass(), "u3");
   78.21  
   78.22        // Verify element klass for system obj array klass
   78.23        assert(objArrayKlass::cast(_systemObjArrayKlassObj)->element_klass() == ok, "u1");
   78.24 @@ -320,8 +320,8 @@
   78.25        assert(Klass::cast(systemObjArrayKlassObj())->super() == ok, "u3");
   78.26      } else {
   78.27        // Set up shared interfaces array.  (Do this before supers are set up.)
   78.28 -      _the_array_interfaces_array->obj_at_put(0, SystemDictionary::cloneable_klass());
   78.29 -      _the_array_interfaces_array->obj_at_put(1, SystemDictionary::serializable_klass());
   78.30 +      _the_array_interfaces_array->obj_at_put(0, SystemDictionary::Cloneable_klass());
   78.31 +      _the_array_interfaces_array->obj_at_put(1, SystemDictionary::Serializable_klass());
   78.32  
   78.33        // Set element klass for system obj array klass
   78.34        objArrayKlass::cast(_systemObjArrayKlassObj)->set_element_klass(ok);
   78.35 @@ -365,7 +365,7 @@
   78.36    // Initialize _objectArrayKlass after core bootstraping to make
   78.37    // sure the super class is set up properly for _objectArrayKlass.
   78.38    _objectArrayKlassObj = instanceKlass::
   78.39 -    cast(SystemDictionary::object_klass())->array_klass(1, CHECK);
   78.40 +    cast(SystemDictionary::Object_klass())->array_klass(1, CHECK);
   78.41    // Add the class to the class hierarchy manually to make sure that
   78.42    // its vtable is initialized after core bootstrapping is completed.
   78.43    Klass::cast(_objectArrayKlassObj)->append_to_sibling_list();
   78.44 @@ -426,11 +426,11 @@
   78.45      while (i < size) {
   78.46        if (!UseConcMarkSweepGC) {
   78.47          // Allocate dummy in old generation
   78.48 -        oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_instance(CHECK);
   78.49 +        oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_instance(CHECK);
   78.50          dummy_array->obj_at_put(i++, dummy);
   78.51        }
   78.52        // Allocate dummy in permanent generation
   78.53 -      oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_permanent_instance(CHECK);
   78.54 +      oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_permanent_instance(CHECK);
   78.55        dummy_array->obj_at_put(i++, dummy);
   78.56      }
   78.57      {
   78.58 @@ -540,7 +540,7 @@
   78.59    // but we cannot do that for classes created before java.lang.Class is loaded. Here we simply
   78.60    // walk over permanent objects created so far (mostly classes) and fixup their mirrors. Note
   78.61    // that the number of objects allocated at this point is very small.
   78.62 -  assert(SystemDictionary::class_klass_loaded(), "java.lang.Class should be loaded");
   78.63 +  assert(SystemDictionary::Class_klass_loaded(), "java.lang.Class should be loaded");
   78.64    FixupMirrorClosure blk;
   78.65    Universe::heap()->permanent_object_iterate(&blk);
   78.66  }
   78.67 @@ -556,7 +556,7 @@
   78.68    if (TraceReferenceGC) tty->print_cr("Callback to run finalizers on exit");
   78.69    {
   78.70      PRESERVE_EXCEPTION_MARK;
   78.71 -    KlassHandle finalizer_klass(THREAD, SystemDictionary::finalizer_klass());
   78.72 +    KlassHandle finalizer_klass(THREAD, SystemDictionary::Finalizer_klass());
   78.73      JavaValue result(T_VOID);
   78.74      JavaCalls::call_static(
   78.75        &result,
   78.76 @@ -950,7 +950,7 @@
   78.77    { ResourceMark rm;
   78.78      Interpreter::initialize();      // needed for interpreter entry points
   78.79      if (!UseSharedSpaces) {
   78.80 -      KlassHandle ok_h(THREAD, SystemDictionary::object_klass());
   78.81 +      KlassHandle ok_h(THREAD, SystemDictionary::Object_klass());
   78.82        Universe::reinitialize_vtable_of(ok_h, CHECK_false);
   78.83        Universe::reinitialize_itables(CHECK_false);
   78.84      }
   78.85 @@ -960,7 +960,7 @@
   78.86    instanceKlassHandle k_h;
   78.87    if (!UseSharedSpaces) {
   78.88      // Setup preallocated empty java.lang.Class array
   78.89 -    Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_false);
   78.90 +    Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false);
   78.91      // Setup preallocated OutOfMemoryError errors
   78.92      k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_OutOfMemoryError(), true, CHECK_false);
   78.93      k_h = instanceKlassHandle(THREAD, k);
   78.94 @@ -1027,8 +1027,8 @@
   78.95    // Setup static method for registering finalizers
   78.96    // The finalizer klass must be linked before looking up the method, in
   78.97    // case it needs to get rewritten.
   78.98 -  instanceKlass::cast(SystemDictionary::finalizer_klass())->link_class(CHECK_false);
   78.99 -  methodOop m = instanceKlass::cast(SystemDictionary::finalizer_klass())->find_method(
  78.100 +  instanceKlass::cast(SystemDictionary::Finalizer_klass())->link_class(CHECK_false);
  78.101 +  methodOop m = instanceKlass::cast(SystemDictionary::Finalizer_klass())->find_method(
  78.102                                    vmSymbols::register_method_name(),
  78.103                                    vmSymbols::register_method_signature());
  78.104    if (m == NULL || !m->is_static()) {
  78.105 @@ -1036,7 +1036,7 @@
  78.106        "java.lang.ref.Finalizer.register", false);
  78.107    }
  78.108    Universe::_finalizer_register_cache->init(
  78.109 -    SystemDictionary::finalizer_klass(), m, CHECK_false);
  78.110 +    SystemDictionary::Finalizer_klass(), m, CHECK_false);
  78.111  
  78.112    // Resolve on first use and initialize class.
  78.113    // Note: No race-condition here, since a resolve will always return the same result
  78.114 @@ -1053,14 +1053,14 @@
  78.115    Universe::_reflect_invoke_cache->init(k_h(), m, CHECK_false);
  78.116  
  78.117    // Setup method for registering loaded classes in class loader vector
  78.118 -  instanceKlass::cast(SystemDictionary::classloader_klass())->link_class(CHECK_false);
  78.119 -  m = instanceKlass::cast(SystemDictionary::classloader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
  78.120 +  instanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
  78.121 +  m = instanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
  78.122    if (m == NULL || m->is_static()) {
  78.123      THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(),
  78.124        "java.lang.ClassLoader.addClass", false);
  78.125    }
  78.126    Universe::_loader_addClass_cache->init(
  78.127 -    SystemDictionary::classloader_klass(), m, CHECK_false);
  78.128 +    SystemDictionary::ClassLoader_klass(), m, CHECK_false);
  78.129  
  78.130    // The folowing is initializing converter functions for serialization in
  78.131    // JVM.cpp. If we clean up the StrictMath code above we may want to find