comparison src/share/vm/classfile/javaClasses.cpp @ 6940:18fb7da42534

8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass Summary: Change types of above methods and field to InstanceKlass and remove unneeded casts from the source files. Reviewed-by: dholmes, coleenp, zgu Contributed-by: harold.seigel@oracle.com
author coleenp
date Tue, 06 Nov 2012 15:09:37 -0500
parents bdb5f8c9978b
children e522a00b91aa bd7a7ce2e264 070d523b96a7
comparison
equal deleted inserted replaced
6939:c284cf4781f0 6940:18fb7da42534
1154 } 1154 }
1155 1155
1156 // Print stack trace element to resource allocated buffer 1156 // Print stack trace element to resource allocated buffer
1157 char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) { 1157 char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) {
1158 // Get strings and string lengths 1158 // Get strings and string lengths
1159 InstanceKlass* klass = InstanceKlass::cast(method->method_holder()); 1159 InstanceKlass* klass = method->method_holder();
1160 const char* klass_name = klass->external_name(); 1160 const char* klass_name = klass->external_name();
1161 int buf_len = (int)strlen(klass_name); 1161 int buf_len = (int)strlen(klass_name);
1162 char* source_file_name; 1162 char* source_file_name;
1163 if (klass->source_file_name() == NULL) { 1163 if (klass->source_file_name() == NULL) {
1164 source_file_name = NULL; 1164 source_file_name = NULL;
1745 } 1745 }
1746 1746
1747 Handle element = ik->allocate_instance_handle(CHECK_0); 1747 Handle element = ik->allocate_instance_handle(CHECK_0);
1748 // Fill in class name 1748 // Fill in class name
1749 ResourceMark rm(THREAD); 1749 ResourceMark rm(THREAD);
1750 const char* str = InstanceKlass::cast(method->method_holder())->external_name(); 1750 const char* str = method->method_holder()->external_name();
1751 oop classname = StringTable::intern((char*) str, CHECK_0); 1751 oop classname = StringTable::intern((char*) str, CHECK_0);
1752 java_lang_StackTraceElement::set_declaringClass(element(), classname); 1752 java_lang_StackTraceElement::set_declaringClass(element(), classname);
1753 // Fill in method name 1753 // Fill in method name
1754 oop methodname = StringTable::intern(method->name(), CHECK_0); 1754 oop methodname = StringTable::intern(method->name(), CHECK_0);
1755 java_lang_StackTraceElement::set_methodName(element(), methodname); 1755 java_lang_StackTraceElement::set_methodName(element(), methodname);
1756 // Fill in source file name 1756 // Fill in source file name
1757 Symbol* source = InstanceKlass::cast(method->method_holder())->source_file_name(); 1757 Symbol* source = method->method_holder()->source_file_name();
1758 if (ShowHiddenFrames && source == NULL) 1758 if (ShowHiddenFrames && source == NULL)
1759 source = vmSymbols::unknown_class_name(); 1759 source = vmSymbols::unknown_class_name();
1760 oop filename = StringTable::intern(source, CHECK_0); 1760 oop filename = StringTable::intern(source, CHECK_0);
1761 java_lang_StackTraceElement::set_fileName(element(), filename); 1761 java_lang_StackTraceElement::set_fileName(element(), filename);
1762 // File in source line number 1762 // File in source line number