jdk8-mips64-public/hotspot: comparison src/share/vm/oops/constMethodKlass.cpp

-:06320b1578cb
+:8150fa46d2ed
 }
 constMethodOop constMethodKlass::allocate(int byte_code_size,
 int compressed_line_number_size,
 int localvariable_table_length,
+int exception_table_length,
 int checked_exceptions_length,
 bool is_conc_safe,
 TRAPS) {
 int size = constMethodOopDesc::object_size(byte_code_size,
 compressed_line_number_size,
 localvariable_table_length,
+exception_table_length,
 checked_exceptions_length);
 KlassHandle h_k(THREAD, as_klassOop());
 constMethodOop cm = (constMethodOop)
 CollectedHeap::permanent_obj_allocate(h_k, size, CHECK_NULL);
 assert(!cm->is_parsable(), "Not yet safely parsable");
 No_Safepoint_Verifier no_safepoint;
 cm->set_interpreter_kind(Interpreter::invalid);
 cm->init_fingerprint();
 cm->set_constants(NULL);
 cm->set_stackmap_data(NULL);
-cm->set_exception_table(NULL);
 cm->set_code_size(byte_code_size);
 cm->set_constMethod_size(size);
 cm->set_inlined_tables_length(checked_exceptions_length,
 compressed_line_number_size,
-localvariable_table_length);
+localvariable_table_length,
+exception_table_length);
 assert(cm->size() == size, "wrong size for object");
 cm->set_is_conc_safe(is_conc_safe);
 cm->set_partially_loaded();
 assert(cm->is_parsable(), "Is safely parsable by gc");
 return cm;
 void constMethodKlass::oop_follow_contents(oop obj) {
 assert (obj->is_constMethod(), "object must be constMethod");
 constMethodOop cm = constMethodOop(obj);
 MarkSweep::mark_and_push(cm->adr_constants());
 MarkSweep::mark_and_push(cm->adr_stackmap_data());
-MarkSweep::mark_and_push(cm->adr_exception_table());
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::constMethodKlassObj never moves.
 }
 #ifndef SERIALGC
 oop obj) {
 assert (obj->is_constMethod(), "object must be constMethod");
 constMethodOop cm_oop = constMethodOop(obj);
 PSParallelCompact::mark_and_push(cm, cm_oop->adr_constants());
 PSParallelCompact::mark_and_push(cm, cm_oop->adr_stackmap_data());
-PSParallelCompact::mark_and_push(cm, cm_oop->adr_exception_table());
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::constMethodKlassObj never moves.
 }
 #endif // SERIALGC
 int constMethodKlass::oop_oop_iterate(oop obj, OopClosure* blk) {
 assert (obj->is_constMethod(), "object must be constMethod");
 constMethodOop cm = constMethodOop(obj);
 blk->do_oop(cm->adr_constants());
 blk->do_oop(cm->adr_stackmap_data());
-blk->do_oop(cm->adr_exception_table());
 // Get size before changing pointers.
 // Don't call size() or oop_size() since that is a virtual call.
 int size = cm->object_size();
 return size;
 }
 oop* adr;
 adr = cm->adr_constants();
 if (mr.contains(adr)) blk->do_oop(adr);
 adr = cm->adr_stackmap_data();
 if (mr.contains(adr)) blk->do_oop(adr);
-adr = cm->adr_exception_table();
-if (mr.contains(adr)) blk->do_oop(adr);
 // Get size before changing pointers.
 // Don't call size() or oop_size() since that is a virtual call.
 int size = cm->object_size();
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::constMethodKlassObj never moves.
 int constMethodKlass::oop_adjust_pointers(oop obj) {
 assert(obj->is_constMethod(), "should be constMethod");
 constMethodOop cm = constMethodOop(obj);
 MarkSweep::adjust_pointer(cm->adr_constants());
 MarkSweep::adjust_pointer(cm->adr_stackmap_data());
-MarkSweep::adjust_pointer(cm->adr_exception_table());
 // Get size before changing pointers.
 // Don't call size() or oop_size() since that is a virtual call.
 int size = cm->object_size();
 // Performance tweak: We skip iterating over the klass pointer since we
 // know that Universe::constMethodKlassObj never moves.
 assert(obj->is_constMethod(), "must be constMethod");
 Klass::oop_print_on(obj, st);
 constMethodOop m = constMethodOop(obj);
 st->print(" - constants:       " INTPTR_FORMAT " ", (address)m->constants());
 m->constants()->print_value_on(st); st->cr();
-st->print(" - exceptions:   " INTPTR_FORMAT "\n", (address)m->exception_table());
 if (m->has_stackmap_table()) {
 st->print(" - stackmap data:       ");
 m->stackmap_data()->print_value_on(st);
 st->cr();
 }
 guarantee(m->constants()->is_perm(), "should be in permspace");
 guarantee(m->constants()->is_constantPool(), "should be constant pool");
 typeArrayOop stackmap_data = m->stackmap_data();
 guarantee(stackmap_data == NULL ||
 stackmap_data->is_perm(),  "should be in permspace");
-guarantee(m->exception_table()->is_perm(), "should be in permspace");
-guarantee(m->exception_table()->is_typeArray(), "should be type array");
 address m_end = (address)((oop*) m + m->size());
 address compressed_table_start = m->code_end();
 guarantee(compressed_table_start <= m_end, "invalid method layout");
 address compressed_table_end = compressed_table_start;
 guarantee(stream.bci() >= 0 && stream.bci() <= m->code_size(), "invalid bci in line number table");
 }
 compressed_table_end += stream.position();
 }
 guarantee(compressed_table_end <= m_end, "invalid method layout");
-// Verify checked exceptions and local variable tables
+// Verify checked exceptions, exception table and local variable tables
 if (m->has_checked_exceptions()) {
 u2* addr = m->checked_exceptions_length_addr();
+guarantee(*addr > 0 && (address) addr >= compressed_table_end && (address) addr < m_end, "invalid method layout");
+}
+if (m->has_exception_handler()) {
+u2* addr = m->exception_table_length_addr();
 guarantee(*addr > 0 && (address) addr >= compressed_table_end && (address) addr < m_end, "invalid method layout");
 }
 if (m->has_localvariable_table()) {
 u2* addr = m->localvariable_table_length_addr();
 guarantee(*addr > 0 && (address) addr >= compressed_table_end && (address) addr < m_end, "invalid method layout");
 }
 // Check compressed_table_end relative to uncompressed_table_start
 u2* uncompressed_table_start;
 if (m->has_localvariable_table()) {
 uncompressed_table_start = (u2*) m->localvariable_table_start();
+} else if (m->has_exception_handler()) {
+uncompressed_table_start = (u2*) m->exception_table_start();
+} else if (m->has_checked_exceptions()) {
+uncompressed_table_start = (u2*) m->checked_exceptions_start();
 } else {
-if (m->has_checked_exceptions()) {
-uncompressed_table_start = (u2*) m->checked_exceptions_start();
-} else {
 uncompressed_table_start = (u2*) m_end;
-}
 }
 int gap = (intptr_t) uncompressed_table_start - (intptr_t) compressed_table_end;
 int max_gap = align_object_size(1)*BytesPerWord;
 guarantee(gap >= 0 && gap < max_gap, "invalid method layout");
 }
 }
 bool constMethodKlass::oop_partially_loaded(oop obj) const {
 assert(obj->is_constMethod(), "object must be klass");
 constMethodOop m = constMethodOop(obj);
-// check whether exception_table points to self (flag for partially loaded)
+// check whether stackmap_data points to self (flag for partially loaded)
-return m->exception_table() == (typeArrayOop)obj;
+return m->stackmap_data() == (typeArrayOop)obj;
 }
 // The exception_table is the last field set when loading an object.
 void constMethodKlass::oop_set_partially_loaded(oop obj) {
 assert(obj->is_constMethod(), "object must be klass");
 constMethodOop m = constMethodOop(obj);
-// Temporarily set exception_table to point to self
+// Temporarily set stackmap_data to point to self
-m->set_exception_table((typeArrayOop)obj);
+m->set_stackmap_data((typeArrayOop)obj);
 }

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

comparison: src/share/vm/oops/constMethodKlass.cpp

src/share/vm/oops/constMethodKlass.cpp