Mercurial > hg > truffle

diff src/share/vm/compiler/compilerOracle.cpp @ 6909:218a94758fe7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 10 Oct 2012 14:28:08 -0700
parents 6b5a3d18fe0e da91efe96a93
children 18fb7da42534
line wrap: on
line diff
--- a/src/share/vm/compiler/compilerOracle.cpp	Wed Sep 26 09:54:11 2012 -0700
+++ b/src/share/vm/compiler/compilerOracle.cpp	Wed Oct 10 14:28:08 2012 -0700
@@ -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"
@@ -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) {