graal-compiler: src/share/vm/oops/methodKlass.cpp comparison

comparison src/share/vm/oops/methodKlass.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 21 Aug 2012 10:39:19 +0200
parents	af59b4dfc9e4 1d7922586cf6
children

comparison

equal deleted inserted replaced

-:fd8832ae511d
+:957c266d8bc5
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 m->set_prev_time(0);
 #endif
 assert(m->is_parsable(), "must be parsable here.");
 assert(m->size() == size, "wrong size for object");
-// We should not publish an uprasable object's reference
-// into one that is parsable, since that presents problems
-// for the concurrent parallel marking and precleaning phases
-// of concurrent gc (CMS).
-xconst->set_method(m);
 return m;
 }
 void methodKlass::oop_follow_contents(oop obj) {
 assert (obj->is_method(), "object must be method");
 methodOop m = methodOop(obj);
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::methodKlassObj never moves.
 MarkSweep::mark_and_push(m->adr_constMethod());
-MarkSweep::mark_and_push(m->adr_constants());
 #ifdef GRAAL
 MarkSweep::mark_and_push(m->adr_graal_mirror());
 #endif
 MarkSweep::mark_and_push(m->adr_method_data());
 }
 assert (obj->is_method(), "object must be method");
 methodOop m = methodOop(obj);
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::methodKlassObj never moves.
 PSParallelCompact::mark_and_push(cm, m->adr_constMethod());
-PSParallelCompact::mark_and_push(cm, m->adr_constants());
 #ifdef GRAAL
 PSParallelCompact::mark_and_push(cm, m->adr_graal_mirror());
 #endif
 PSParallelCompact::mark_and_push(cm, m->adr_method_data());
 }
 // Don't call size() or oop_size() since that is a virtual call.
 int size = m->object_size();
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::methodKlassObj never moves
 blk->do_oop(m->adr_constMethod());
-blk->do_oop(m->adr_constants());
 #ifdef GRAAL
 blk->do_oop(m->adr_graal_mirror());
 #endif
 blk->do_oop(m->adr_method_data());
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::methodKlassObj never moves.
 oop* adr;
 adr = m->adr_constMethod();
 if (mr.contains(adr)) blk->do_oop(adr);
-adr = m->adr_constants();
-if (mr.contains(adr)) blk->do_oop(adr);
 #ifdef GRAAL
 adr = m->adr_graal_mirror();
 if (mr.contains(adr)) blk->do_oop(adr);
 #endif
 adr = m->adr_method_data();
 // Don't call size() or oop_size() since that is a virtual call.
 int size = m->object_size();
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::methodKlassObj never moves.
 MarkSweep::adjust_pointer(m->adr_constMethod());
-MarkSweep::adjust_pointer(m->adr_constants());
 #ifdef GRAAL
 MarkSweep::adjust_pointer(m->adr_graal_mirror());
 #endif
 MarkSweep::adjust_pointer(m->adr_method_data());
 int methodKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
 assert(obj->is_method(), "should be method");
 methodOop m = methodOop(obj);
 PSParallelCompact::adjust_pointer(m->adr_constMethod());
-PSParallelCompact::adjust_pointer(m->adr_constants());
 #ifdef GRAAL
 PSParallelCompact::adjust_pointer(m->adr_graal_mirror());
 #endif
 PSParallelCompact::adjust_pointer(m->adr_method_data());
 return m->object_size();
 st->print_cr(" - intrinsic id:      %d %s", m->intrinsic_id(), vmIntrinsics::name_at(m->intrinsic_id()));
 if (m->highest_comp_level() != CompLevel_none)
 st->print_cr(" - highest level:     %d", m->highest_comp_level());
 st->print_cr(" - vtable index:      %d",   m->_vtable_index);
 st->print_cr(" - i2i entry:         " INTPTR_FORMAT, m->interpreter_entry());
-st->print_cr(" - adapter:           " INTPTR_FORMAT, m->adapter());
+st->print(   " - adapters:          ");
+if (m->adapter() == NULL)
+st->print_cr(INTPTR_FORMAT, m->adapter());
+else
+m->adapter()->print_adapter_on(st);
 st->print_cr(" - compiled entry     " INTPTR_FORMAT, m->from_compiled_entry());
 st->print_cr(" - code size:         %d",   m->code_size());
 if (m->code_size() != 0) {
 st->print_cr(" - code start:        " INTPTR_FORMAT, m->code_base());
 st->print_cr(" - code end (excl):   " INTPTR_FORMAT, m->code_base() + m->code_size());
 }
 }
 if (m->code() != NULL) {
 st->print   (" - compiled code: ");
 m->code()->print_value_on(st);
-st->cr();
+}
-}
+if (m->is_native()) {
-if (m->is_method_handle_invoke()) {
-st->print_cr(" - invoke method type: " INTPTR_FORMAT, (address) m->method_handle_type());
-// m is classified as native, but it does not have an interesting
-// native_function or signature handler
-} else if (m->is_native()) {
 st->print_cr(" - native function:   " INTPTR_FORMAT, m->native_function());
 st->print_cr(" - signature handler: " INTPTR_FORMAT, m->signature_handler());
 }
 }
 Klass::oop_verify_on(obj, st);
 guarantee(obj->is_method(), "object must be method");
 if (!obj->partially_loaded()) {
 methodOop m = methodOop(obj);
 guarantee(m->is_perm(),  "should be in permspace");
-guarantee(m->constants()->is_perm(), "should be in permspace");
-guarantee(m->constants()->is_constantPool(), "should be constant pool");
 guarantee(m->constMethod()->is_constMethod(), "should be constMethodOop");
 guarantee(m->constMethod()->is_perm(), "should be in permspace");
 methodDataOop method_data = m->method_data();
 guarantee(method_data == NULL ||
 method_data->is_perm(), "should be in permspace");

Mercurial > hg > graal-compiler

comparison src/share/vm/oops/methodKlass.cpp @ 6275:957c266d8bc5