Mercurial > hg > graal-jvmci-8
diff src/share/vm/compiler/compilerOracle.cpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | e522a00b91aa |
children | 989155e2d07a |
line wrap: on
line diff
--- a/src/share/vm/compiler/compilerOracle.cpp Fri Nov 23 11:40:17 2012 +0100 +++ b/src/share/vm/compiler/compilerOracle.cpp Fri Nov 23 11:50:27 2012 +0100 @@ -28,7 +28,7 @@ #include "memory/oopFactory.hpp" #include "memory/resourceArea.hpp" #include "oops/klass.hpp" -#include "oops/methodOop.hpp" +#include "oops/method.hpp" #include "oops/oop.inline.hpp" #include "oops/symbol.hpp" #include "runtime/handles.inline.hpp" @@ -67,7 +67,7 @@ // utility method MethodMatcher* find(methodHandle method) { - Symbol* class_name = Klass::cast(method->method_holder())->name(); + Symbol* class_name = method->method_holder()->name(); Symbol* method_name = method->name(); for (MethodMatcher* current = this; current != NULL; current = current->_next) { if (match(class_name, current->class_name(), current->_class_mode) && @@ -455,7 +455,7 @@ // exclude java/lang/String indexOf // exclude,java/lang/String,indexOf // For easy cut-and-paste of method names, allow VM output format - // as produced by methodOopDesc::print_short_name: + // as produced by Method::print_short_name: // exclude java.lang.String::indexOf // For simple implementation convenience here, convert them all to space. if (have_colon) { @@ -574,7 +574,7 @@ char token[1024]; int pos = 0; int c = getc(stream); - while(c != EOF) { + while(c != EOF && pos < (int)(sizeof(token)-1)) { if (c == '\n') { token[pos++] = '\0'; parse_from_line(token); @@ -595,7 +595,7 @@ int pos = 0; const char* sp = str; int c = *sp++; - while (c != '\0') { + while (c != '\0' && pos < (int)(sizeof(token)-1)) { if (c == '\n') { token[pos++] = '\0'; parse_line(token); @@ -624,7 +624,7 @@ assert(has_command_file(), "command file must be specified"); fileStream stream(fopen(cc_file(), "at")); stream.print("exclude "); - Klass::cast(method->method_holder())->name()->print_symbol_on(&stream); + method->method_holder()->name()->print_symbol_on(&stream); stream.print("."); method->name()->print_symbol_on(&stream); method->signature()->print_symbol_on(&stream);