jdk-sandbox: comparison hotspot/src/share/vm/classfile/javaClasses.cpp

equal deleted inserted replaced

-:e92acc84ade3
+:5341188db763
 /*
-* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, 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.
 if (msg != NULL) {
 st->print(": %s", java_lang_String::as_utf8_string(msg));
 }
 }
-// Print stack trace element to resource allocated buffer
+// After this many redefines, the stack trace is unreliable.
-char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) {
+const int MAX_VERSION = USHRT_MAX;
-// Get strings and string lengths
-InstanceKlass* klass = method->method_holder();
+// Helper backtrace functions to store bci|version together.
-const char* klass_name  = klass->external_name();
+static inline int merge_bci_and_version(int bci, int version) {
-int buf_len = (int)strlen(klass_name);
+// only store u2 for version, checking for overflow.
-char* source_file_name;
+if (version > USHRT_MAX || version < 0) version = MAX_VERSION;
-if (klass->source_file_name() == NULL) {
+assert((jushort)bci == bci, "bci should be short");
-source_file_name = NULL;
+return build_int_from_shorts(version, bci);
+}
+static inline int bci_at(unsigned int merged) {
+return extract_high_short_from_int(merged);
+}
+static inline int version_at(unsigned int merged) {
+return extract_low_short_from_int(merged);
+}
+static inline bool version_matches(Method* method, int version) {
+return (method->constants()->version() == version && version < MAX_VERSION);
+}
+static inline int get_line_number(Method* method, int bci) {
+int line_number = 0;
+if (method->is_native()) {
+// Negative value different from -1 below, enabling Java code in
+// class java.lang.StackTraceElement to distinguish "native" from
+// "no LineNumberTable".  JDK tests for -2.
+line_number = -2;
 } else {
-source_file_name = klass->source_file_name()->as_C_string();
+// Returns -1 if no LineNumberTable, and otherwise actual line number
-buf_len += (int)strlen(source_file_name);
+line_number = method->line_number_from_bci(bci);
-}
+if (line_number == -1 && ShowHiddenFrames) {
-char* method_name = method->name()->as_C_string();
+line_number = bci + 1000000;
-buf_len += (int)strlen(method_name);
+}
+}
-// Allocate temporary buffer with extra space for formatting and line number
+return line_number;
-char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64);
-// Print stack trace line in buffer
-sprintf(buf, "\tat %s.%s", klass_name, method_name);
-if (method->is_native()) {
-strcat(buf, "(Native Method)");
-} else {
-int line_number = method->line_number_from_bci(bci);
-if (source_file_name != NULL && (line_number != -1)) {
-// Sourcename and linenumber
-sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number);
-} else if (source_file_name != NULL) {
-// Just sourcename
-sprintf(buf + (int)strlen(buf), "(%s)", source_file_name);
-} else {
-// Neither soucename and linenumber
-sprintf(buf + (int)strlen(buf), "(Unknown Source)");
-}
-nmethod* nm = method->code();
-if (WizardMode && nm != NULL) {
-sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
-}
-}
-return buf;
-}
-void java_lang_Throwable::print_stack_element(Handle stream, Method* method, int bci) {
-ResourceMark rm;
-char* buf = print_stack_element_to_buffer(method, bci);
-print_to_stream(stream, buf);
-}
-void java_lang_Throwable::print_stack_element(outputStream *st, Method* method, int bci) {
-ResourceMark rm;
-char* buf = print_stack_element_to_buffer(method, bci);
-st->print_cr("%s", buf);
-}
-void java_lang_Throwable::print_to_stream(Handle stream, const char* str) {
-if (stream.is_null()) {
-tty->print_cr("%s", str);
-} else {
-EXCEPTION_MARK;
-JavaValue result(T_VOID);
-Handle arg (THREAD, oopFactory::new_charArray(str, THREAD));
-if (!HAS_PENDING_EXCEPTION) {
-JavaCalls::call_virtual(&result,
-stream,
-KlassHandle(THREAD, stream->klass()),
-vmSymbols::println_name(),
-vmSymbols::char_array_void_signature(),
-arg,
-THREAD);
-}
-// Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
-if (HAS_PENDING_EXCEPTION) CLEAR_PENDING_EXCEPTION;
-}
-}
-const char* java_lang_Throwable::no_stack_trace_message() {
-return "\t<<no stack trace available>>";
-}
-// Currently used only for exceptions occurring during startup
-void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
-Thread *THREAD = Thread::current();
-Handle h_throwable(THREAD, throwable);
-while (h_throwable.not_null()) {
-objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
-if (result.is_null()) {
-st->print_cr(no_stack_trace_message());
-return;
-}
-while (result.not_null()) {
-typeArrayHandle methods (THREAD,
-typeArrayOop(result->obj_at(trace_methods_offset)));
-typeArrayHandle bcis (THREAD,
-typeArrayOop(result->obj_at(trace_bcis_offset)));
-if (methods.is_null() || bcis.is_null()) {
-st->print_cr(no_stack_trace_message());
-return;
-}
-int length = methods()->length();
-for (int index = 0; index < length; index++) {
-Method* method = ((Method*)methods()->metadata_at(index));
-if (method == NULL) goto handle_cause;
-int bci = bcis->ushort_at(index);
-print_stack_element(st, method, bci);
-}
-result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
-}
-handle_cause:
-{
-EXCEPTION_MARK;
-JavaValue result(T_OBJECT);
-JavaCalls::call_virtual(&result,
-h_throwable,
-KlassHandle(THREAD, h_throwable->klass()),
-vmSymbols::getCause_name(),
-vmSymbols::void_throwable_signature(),
-THREAD);
-// Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
-if (HAS_PENDING_EXCEPTION) {
-CLEAR_PENDING_EXCEPTION;
-h_throwable = Handle();
-} else {
-h_throwable = Handle(THREAD, (oop) result.get_jobject());
-if (h_throwable.not_null()) {
-st->print("Caused by: ");
-print(h_throwable, st);
-st->cr();
-}
-}
-}
-}
-}
-void java_lang_Throwable::print_stack_trace(oop throwable, oop print_stream) {
-// Note: this is no longer used in Merlin, but we support it for compatibility.
-Thread *thread = Thread::current();
-Handle stream(thread, print_stream);
-objArrayHandle result (thread, objArrayOop(backtrace(throwable)));
-if (result.is_null()) {
-print_to_stream(stream, no_stack_trace_message());
-return;
-}
-while (result.not_null()) {
-typeArrayHandle methods(thread,
-typeArrayOop(result->obj_at(trace_methods_offset)));
-typeArrayHandle bcis (thread,
-typeArrayOop(result->obj_at(trace_bcis_offset)));
-if (methods.is_null() || bcis.is_null()) {
-print_to_stream(stream, no_stack_trace_message());
-return;
-}
-int length = methods()->length();
-for (int index = 0; index < length; index++) {
-Method* method = ((Method*)methods()->metadata_at(index));
-if (method == NULL) return;
-int bci = bcis->ushort_at(index);
-print_stack_element(stream, method, bci);
-}
-result = objArrayHandle(thread, objArrayOop(result->obj_at(trace_next_offset)));
-}
 }
 // This class provides a simple wrapper over the internal structure of
 // exception backtrace to insulate users of the backtrace from needing
 // to know what it looks like.
 public:
 enum {
 trace_methods_offset = java_lang_Throwable::trace_methods_offset,
-trace_bcis_offset    = java_lang_Throwable::trace_bcis_offset,
+trace_bcis_offset = java_lang_Throwable::trace_bcis_offset,
 trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset,
 trace_next_offset    = java_lang_Throwable::trace_next_offset,
 trace_size           = java_lang_Throwable::trace_size,
 trace_chunk_size     = java_lang_Throwable::trace_chunk_size
 };
+// get info out of chunks
+static typeArrayOop get_methods(objArrayHandle chunk) {
+typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
+assert(methods != NULL, "method array should be initialized in backtrace");
+return methods;
+}
+static typeArrayOop get_bcis(objArrayHandle chunk) {
+typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
+assert(bcis != NULL, "bci array should be initialized in backtrace");
+return bcis;
+}
+static objArrayOop get_mirrors(objArrayHandle chunk) {
+objArrayOop mirrors = objArrayOop(chunk->obj_at(trace_mirrors_offset));
+assert(mirrors != NULL, "mirror array should be initialized in backtrace");
+return mirrors;
+}
 // constructor for new backtrace
 BacktraceBuilder(TRAPS): _methods(NULL), _bcis(NULL), _head(NULL), _mirrors(NULL) {
 expand(CHECK);
 _backtrace = _head;
 _index = 0;
 }
+BacktraceBuilder(objArrayHandle backtrace) {
+_methods = get_methods(backtrace);
+_bcis = get_bcis(backtrace);
+_mirrors = get_mirrors(backtrace);
+assert(_methods->length() == _bcis->length() &&
+_methods->length() == _mirrors->length(),
+"method and source information arrays should match");
+// head is the preallocated backtrace
+_backtrace = _head = backtrace();
+_index = 0;
+}
 void expand(TRAPS) {
 objArrayHandle old_head(THREAD, _head);
 Pause_No_Safepoint_Verifier pnsv(&_nsv);
 objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK);
 objArrayHandle new_head(THREAD, head);
-typeArrayOop methods = oopFactory::new_metaDataArray(trace_chunk_size, CHECK);
+typeArrayOop methods = oopFactory::new_shortArray(trace_chunk_size, CHECK);
 typeArrayHandle new_methods(THREAD, methods);
-typeArrayOop bcis = oopFactory::new_shortArray(trace_chunk_size, CHECK);
+typeArrayOop bcis = oopFactory::new_intArray(trace_chunk_size, CHECK);
 typeArrayHandle new_bcis(THREAD, bcis);
 objArrayOop mirrors = oopFactory::new_objectArray(trace_chunk_size, CHECK);
 objArrayHandle new_mirrors(THREAD, mirrors);
 new_head->obj_at_put(trace_bcis_offset, new_bcis());
 new_head->obj_at_put(trace_mirrors_offset, new_mirrors());
 _head    = new_head();
 _methods = new_methods();
-_bcis    = new_bcis();
+_bcis = new_bcis();
 _mirrors = new_mirrors();
 _index = 0;
 }
 oop backtrace() {
 inline void push(Method* method, int bci, TRAPS) {
 // Smear the -1 bci to 0 since the array only holds unsigned
 // shorts.  The later line number lookup would just smear the -1
 // to a 0 even if it could be recorded.
 if (bci == SynchronizationEntryBCI) bci = 0;
-assert(bci == (jushort)bci, "doesn't fit");
 if (_index >= trace_chunk_size) {
 methodHandle mhandle(THREAD, method);
 expand(CHECK);
 method = mhandle();
 }
-_methods->metadata_at_put(_index, method);
+_methods->short_at_put(_index, method->method_idnum());
-_bcis->ushort_at_put(_index, bci);
+_bcis->int_at_put(_index, merge_bci_and_version(bci, method->constants()->version()));
-// we need to save the mirrors in the backtrace to keep the methods from
-// being unloaded if their class loader is unloaded while we still have
+// We need to save the mirrors in the backtrace to keep the class
-// this stack trace.
+// from being unloaded while we still have this stack trace.
+assert(method->method_holder()->java_mirror() != NULL, "never push null for mirror");
 _mirrors->obj_at_put(_index, method->method_holder()->java_mirror());
 _index++;
 }
-Method* current_method() {
-assert(_index >= 0 && _index < trace_chunk_size, "out of range");
-return ((Method*)_methods->metadata_at(_index));
-}
-jushort current_bci() {
-assert(_index >= 0 && _index < trace_chunk_size, "out of range");
-return _bcis->ushort_at(_index);
-}
 };
+// Print stack trace element to resource allocated buffer
+char* java_lang_Throwable::print_stack_element_to_buffer(Handle mirror,
+int method_id, int version, int bci) {
+// Get strings and string lengths
+InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror()));
+const char* klass_name  = holder->external_name();
+int buf_len = (int)strlen(klass_name);
+// pushing to the stack trace added one.
+Method* method = holder->method_with_idnum(method_id);
+char* method_name = method->name()->as_C_string();
+buf_len += (int)strlen(method_name);
+char* source_file_name = NULL;
+if (version_matches(method, version)) {
+Symbol* source = holder->source_file_name();
+if (source != NULL) {
+source_file_name = source->as_C_string();
+buf_len += (int)strlen(source_file_name);
+}
+}
+// Allocate temporary buffer with extra space for formatting and line number
+char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64);
+// Print stack trace line in buffer
+sprintf(buf, "\tat %s.%s", klass_name, method_name);
+if (!version_matches(method, version)) {
+strcat(buf, "(Redefined)");
+} else {
+int line_number = get_line_number(method, bci);
+if (line_number == -2) {
+strcat(buf, "(Native Method)");
+} else {
+if (source_file_name != NULL && (line_number != -1)) {
+// Sourcename and linenumber
+sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number);
+} else if (source_file_name != NULL) {
+// Just sourcename
+sprintf(buf + (int)strlen(buf), "(%s)", source_file_name);
+} else {
+// Neither sourcename nor linenumber
+sprintf(buf + (int)strlen(buf), "(Unknown Source)");
+}
+nmethod* nm = method->code();
+if (WizardMode && nm != NULL) {
+sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
+}
+}
+}
+return buf;
+}
+void java_lang_Throwable::print_stack_element(outputStream *st, Handle mirror,
+int method_id, int version, int bci) {
+ResourceMark rm;
+char* buf = print_stack_element_to_buffer(mirror, method_id, version, bci);
+st->print_cr("%s", buf);
+}
+void java_lang_Throwable::print_stack_element(outputStream *st, methodHandle method, int bci) {
+Handle mirror = method->method_holder()->java_mirror();
+int method_id = method->method_idnum();
+int version = method->constants()->version();
+print_stack_element(st, mirror, method_id, version, bci);
+}
+const char* java_lang_Throwable::no_stack_trace_message() {
+return "\t<<no stack trace available>>";
+}
+// Currently used only for exceptions occurring during startup
+void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
+Thread *THREAD = Thread::current();
+Handle h_throwable(THREAD, throwable);
+while (h_throwable.not_null()) {
+objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
+if (result.is_null()) {
+st->print_cr(no_stack_trace_message());
+return;
+}
+while (result.not_null()) {
+// Get method id, bci, version and mirror from chunk
+typeArrayHandle methods (THREAD, BacktraceBuilder::get_methods(result));
+typeArrayHandle bcis (THREAD, BacktraceBuilder::get_bcis(result));
+objArrayHandle mirrors (THREAD, BacktraceBuilder::get_mirrors(result));
+int length = methods()->length();
+for (int index = 0; index < length; index++) {
+Handle mirror(THREAD, mirrors->obj_at(index));
+// NULL mirror means end of stack trace
+if (mirror.is_null()) goto handle_cause;
+int method = methods->short_at(index);
+int version = version_at(bcis->int_at(index));
+int bci = bci_at(bcis->int_at(index));
+print_stack_element(st, mirror, method, version, bci);
+}
+result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
+}
+handle_cause:
+{
+EXCEPTION_MARK;
+JavaValue cause(T_OBJECT);
+JavaCalls::call_virtual(&cause,
+h_throwable,
+KlassHandle(THREAD, h_throwable->klass()),
+vmSymbols::getCause_name(),
+vmSymbols::void_throwable_signature(),
+THREAD);
+// Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
+if (HAS_PENDING_EXCEPTION) {
+CLEAR_PENDING_EXCEPTION;
+h_throwable = Handle();
+} else {
+h_throwable = Handle(THREAD, (oop) cause.get_jobject());
+if (h_throwable.not_null()) {
+st->print("Caused by: ");
+print(h_throwable, st);
+st->cr();
+}
+}
+}
+}
+}
 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS) {
 if (!StackTraceInThrowable) return;
 ResourceMark rm(THREAD);
 void java_lang_Throwable::allocate_backtrace(Handle throwable, TRAPS) {
 // Allocate stack trace - backtrace is created but not filled in
 // No-op if stack trace is disabled
 if (!StackTraceInThrowable) return;
+BacktraceBuilder bt(CHECK);   // creates a backtrace
-objArrayOop h_oop = oopFactory::new_objectArray(trace_size, CHECK);
+set_backtrace(throwable(), bt.backtrace());
-objArrayHandle backtrace  (THREAD, h_oop);
-typeArrayOop m_oop = oopFactory::new_metaDataArray(trace_chunk_size, CHECK);
-typeArrayHandle methods (THREAD, m_oop);
-typeArrayOop b = oopFactory::new_shortArray(trace_chunk_size, CHECK);
-typeArrayHandle bcis(THREAD, b);
-objArrayOop mirror_oop = oopFactory::new_objectArray(trace_chunk_size, CHECK);
-objArrayHandle mirrors (THREAD, mirror_oop);
-// backtrace has space for one chunk (next is NULL)
-backtrace->obj_at_put(trace_methods_offset, methods());
-backtrace->obj_at_put(trace_bcis_offset, bcis());
-backtrace->obj_at_put(trace_mirrors_offset, mirrors());
-set_backtrace(throwable(), backtrace());
 }
 void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle throwable) {
 // Fill in stack trace into preallocated backtrace (no GC)
 // No-op if stack trace is disabled
 if (!StackTraceInThrowable) return;
 assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check");
-objArrayOop backtrace = (objArrayOop)java_lang_Throwable::backtrace(throwable());
+JavaThread* THREAD = JavaThread::current();
-assert(backtrace != NULL, "backtrace not preallocated");
+objArrayHandle backtrace (THREAD, (objArrayOop)java_lang_Throwable::backtrace(throwable()));
-oop m = backtrace->obj_at(trace_methods_offset);
+assert(backtrace.not_null(), "backtrace should have been preallocated");
-typeArrayOop methods = typeArrayOop(m);
-assert(methods != NULL && methods->length() > 0, "method array not preallocated");
+ResourceMark rm(THREAD);
+vframeStream st(THREAD);
-oop b = backtrace->obj_at(trace_bcis_offset);
-typeArrayOop bcis = typeArrayOop(b);
+BacktraceBuilder bt(backtrace);
-assert(bcis != NULL, "bci array not preallocated");
-oop mr = backtrace->obj_at(trace_mirrors_offset);
-objArrayOop mirrors = objArrayOop(mr);
-assert(mirrors != NULL, "bci array not preallocated");
-assert(methods->length() == bcis->length() &&
-methods->length() == mirrors->length(),
-"method and bci arrays should match");
-JavaThread* thread = JavaThread::current();
-ResourceMark rm(thread);
-vframeStream st(thread);
 // Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init
 // methods as preallocated errors aren't created by "java" code.
 // fill in as much stack trace as possible
+typeArrayOop methods = BacktraceBuilder::get_methods(backtrace);
 int max_chunks = MIN2(methods->length(), (int)MaxJavaStackTraceDepth);
 int chunk_count = 0;
 for (;!st.at_end(); st.next()) {
-// Add entry and smear the -1 bci to 0 since the array only holds
+bt.push(st.method(), st.bci(), CHECK);
-// unsigned shorts.  The later line number lookup would just smear
-// the -1 to a 0 even if it could be recorded.
-int bci = st.bci();
-if (bci == SynchronizationEntryBCI) bci = 0;
-assert(bci == (jushort)bci, "doesn't fit");
-bcis->ushort_at_put(chunk_count, bci);
-methods->metadata_at_put(chunk_count, st.method());
-mirrors->obj_at_put(chunk_count,
-st.method()->method_holder()->java_mirror());
 chunk_count++;
 // Bail-out for deep stacks
 if (chunk_count >= max_chunks) break;
 }
 // can be removed in a JDK using this JVM version
 if (JDK_Version::is_gte_jdk17x_version()) {
 java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace());
 assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized");
 }
 }
 int java_lang_Throwable::get_stack_trace_depth(oop throwable, TRAPS) {
 if (throwable == NULL) {
 if (next == NULL) break;
 depth += trace_chunk_size;
 chunk = next;
 }
 assert(chunk != NULL && chunk->obj_at(trace_next_offset) == NULL, "sanity check");
-// Count element in remaining partial chunk
+// Count element in remaining partial chunk.  NULL value for mirror
-typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
+// marks the end of the stack trace elements that are saved.
-typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
+objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk);
-assert(methods != NULL && bcis != NULL, "sanity check");
+assert(mirrors != NULL, "sanity check");
-for (int i = 0; i < methods->length(); i++) {
+for (int i = 0; i < mirrors->length(); i++) {
-if (methods->metadata_at(i) == NULL) break;
+if (mirrors->obj_at(i) == NULL) break;
 depth++;
 }
 }
 return depth;
 }
 skip_chunks--;
 }
 if (chunk == NULL) {
 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
 }
-// Get method,bci from chunk
+// Get method id, bci, version and mirror from chunk
-typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
+typeArrayOop methods = BacktraceBuilder::get_methods(chunk);
-typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
+typeArrayOop bcis = BacktraceBuilder::get_bcis(chunk);
-assert(methods != NULL && bcis != NULL, "sanity check");
+objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk);
-methodHandle method(THREAD, ((Method*)methods->metadata_at(chunk_index)));
-int bci = bcis->ushort_at(chunk_index);
+assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check");
+int method = methods->short_at(chunk_index);
+int version = version_at(bcis->int_at(chunk_index));
+int bci = bci_at(bcis->int_at(chunk_index));
+Handle mirror(THREAD, mirrors->obj_at(chunk_index));
 // Chunk can be partial full
-if (method.is_null()) {
+if (mirror.is_null()) {
 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
 }
-oop element = java_lang_StackTraceElement::create(method, bci, CHECK_0);
+oop element = java_lang_StackTraceElement::create(mirror, method, version, bci, CHECK_0);
 return element;
 }
-oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) {
+oop java_lang_StackTraceElement::create(Handle mirror, int method_id, int version, int bci, TRAPS) {
-// SystemDictionary::stackTraceElement_klass() will be null for pre-1.4 JDKs
-assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4");
 // Allocate java.lang.StackTraceElement instance
 Klass* k = SystemDictionary::StackTraceElement_klass();
 assert(k != NULL, "must be loaded in 1.4+");
 instanceKlassHandle ik (THREAD, k);
 if (ik->should_be_initialized()) {
 }
 Handle element = ik->allocate_instance_handle(CHECK_0);
 // Fill in class name
 ResourceMark rm(THREAD);
-const char* str = method->method_holder()->external_name();
+InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror()));
+const char* str = holder->external_name();
 oop classname = StringTable::intern((char*) str, CHECK_0);
 java_lang_StackTraceElement::set_declaringClass(element(), classname);
 // Fill in method name
+Method* method = holder->method_with_idnum(method_id);
 oop methodname = StringTable::intern(method->name(), CHECK_0);
 java_lang_StackTraceElement::set_methodName(element(), methodname);
-// Fill in source file name
-Symbol* source = method->method_holder()->source_file_name();
+if (!version_matches(method, version)) {
-if (ShowHiddenFrames && source == NULL)
+// The method was redefined, accurate line number information isn't available
-source = vmSymbols::unknown_class_name();
+java_lang_StackTraceElement::set_fileName(element(), NULL);
-oop filename = StringTable::intern(source, CHECK_0);
+java_lang_StackTraceElement::set_lineNumber(element(), -1);
-java_lang_StackTraceElement::set_fileName(element(), filename);
-// File in source line number
-int line_number;
-if (method->is_native()) {
-// Negative value different from -1 below, enabling Java code in
-// class java.lang.StackTraceElement to distinguish "native" from
-// "no LineNumberTable".
-line_number = -2;
 } else {
-// Returns -1 if no LineNumberTable, and otherwise actual line number
+// Fill in source file name and line number.
-line_number = method->line_number_from_bci(bci);
+Symbol* source = holder->source_file_name();
-if (line_number == -1 && ShowHiddenFrames) {
+if (ShowHiddenFrames && source == NULL)
-line_number = bci + 1000000;
+source = vmSymbols::unknown_class_name();
-}
+oop filename = StringTable::intern(source, CHECK_0);
-}
+java_lang_StackTraceElement::set_fileName(element(), filename);
-java_lang_StackTraceElement::set_lineNumber(element(), line_number);
+int line_number = get_line_number(method, bci);
+java_lang_StackTraceElement::set_lineNumber(element(), line_number);
+}
 return element();
 }
+oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) {
+Handle mirror (THREAD, method->method_holder()->java_mirror());
+int method_id = method->method_idnum();
+return create(mirror, method_id, method->constants()->version(), bci, THREAD);
+}
 void java_lang_reflect_AccessibleObject::compute_offsets() {
 Klass* k = SystemDictionary::reflect_AccessibleObject_klass();
 compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature());
 }

changeset 15229	5341188db763
parent 15102	0a86564e5f61
child 15232	3c75bf718b2e