# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1362524337 -3600
# Node ID 0026a2e70695afcc3ecbdbbc0e36794eed17632d
# Parent  5fc51c1ecdeb6d9b4b85be9710576f9ff023d71b
Merge fixes.

diff -r 5fc51c1ecdeb -r 0026a2e70695 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 05 23:44:54 2013 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 05 23:58:57 2013 +0100
@@ -407,10 +407,6 @@
   } else if (tag.is_klass() || tag.is_unresolved_klass()) {
     Handle type = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL);
     result = type();
-  } else if (tag.is_object()) {
-    oop obj = cp->object_at(index);
-    assert(obj->is_instance(), "must be an instance");
-    result = VMToCompiler::createConstantObject(obj, CHECK_NULL);
   } else {
     tty->print("unknown constant pool tag (%s) at cpi %d in %s: ", tag.internal_name(), index, cp->pool_holder()->name()->as_C_string());
     ShouldNotReachHere();
diff -r 5fc51c1ecdeb -r 0026a2e70695 src/share/vm/oops/methodData.cpp
--- a/src/share/vm/oops/methodData.cpp	Tue Mar 05 23:44:54 2013 +0100
+++ b/src/share/vm/oops/methodData.cpp	Tue Mar 05 23:58:57 2013 +0100
@@ -760,13 +760,6 @@
   return CompilationPolicy::policy()->is_mature(_method);
 }
 
-void MethodData::inc_decompile_count() {
-  _nof_decompiles += 1;
-  if (decompile_count() > (uint)PerMethodRecompilationCutoff) {
-    method()->set_not_compilable(CompLevel_full_optimization);
-  }
-}
-
 // Translate a bci to its corresponding data index (di).
 address MethodData::bci_to_dp(int bci) {
   ResourceMark rm;
diff -r 5fc51c1ecdeb -r 0026a2e70695 src/share/vm/runtime/init.cpp
--- a/src/share/vm/runtime/init.cpp	Tue Mar 05 23:44:54 2013 +0100
+++ b/src/share/vm/runtime/init.cpp	Tue Mar 05 23:58:57 2013 +0100
@@ -35,6 +35,7 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/machineCodePrinter.hpp"
 
 // Initialization done by VM thread in vm_init_globals()
 void check_ThreadShadow();