Mercurial > hg > truffle

comparison src/share/vm/interpreter/bytecodeInterpreter.cpp @ 2376:c7f3d0b4570f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7017732: move static fields into Class to prepare for perm gen removal Reviewed-by: kvn, coleenp, twisti, stefank
author never
date Fri, 18 Mar 2011 16:00:34 -0700
parents 850b2295a494
children f731b22cd52d
comparison
equal deleted inserted replaced
2375:d673ef06fe96 2376:c7f3d0b4570f
654 // lock method if synchronized 654 // lock method if synchronized
655 if (METHOD->is_synchronized()) { 655 if (METHOD->is_synchronized()) {
656 // oop rcvr = locals[0].j.r; 656 // oop rcvr = locals[0].j.r;
657 oop rcvr; 657 oop rcvr;
658 if (METHOD->is_static()) { 658 if (METHOD->is_static()) {
659 rcvr = METHOD->constants()->pool_holder()->klass_part()->java_mirror(); 659 rcvr = METHOD->constants()->pool_holder()->java_mirror();
660 } else { 660 } else {
661 rcvr = LOCALS_OBJECT(0); 661 rcvr = LOCALS_OBJECT(0);
662 VERIFY_OOP(rcvr); 662 VERIFY_OOP(rcvr);
663 } 663 }
664 // The initial monitor is ours for the taking 664 // The initial monitor is ours for the taking
2109 VERIFY_OOP(constants->resolved_string_at(index)); 2109 VERIFY_OOP(constants->resolved_string_at(index));
2110 SET_STACK_OBJECT(constants->resolved_string_at(index), 0); 2110 SET_STACK_OBJECT(constants->resolved_string_at(index), 0);
2111 break; 2111 break;
2112 2112
2113 case JVM_CONSTANT_Class: 2113 case JVM_CONSTANT_Class:
2114 VERIFY_OOP(constants->resolved_klass_at(index)->klass_part()->java_mirror()); 2114 VERIFY_OOP(constants->resolved_klass_at(index)->java_mirror());
2115 SET_STACK_OBJECT(constants->resolved_klass_at(index)->klass_part()->java_mirror(), 0); 2115 SET_STACK_OBJECT(constants->resolved_klass_at(index)->java_mirror(), 0);
2116 break; 2116 break;
2117 2117
2118 case JVM_CONSTANT_UnresolvedString: 2118 case JVM_CONSTANT_UnresolvedString:
2119 case JVM_CONSTANT_UnresolvedClass: 2119 case JVM_CONSTANT_UnresolvedClass:
2120 case JVM_CONSTANT_UnresolvedClassInError: 2120 case JVM_CONSTANT_UnresolvedClassInError: