From cb38e9a6c68ef5457f3515abc73130936adfe8d9 Mon Sep 17 00:00:00 2001
From: twisti <unknown>
Date: Fri, 8 Oct 2010 02:42:17 -0700
Subject: [PATCH] 6990549: Zero and Shark fixes after 6978355 and 6953144
 Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

---
 src/cpu/zero/vm/interpreterRT_zero.hpp | 8 ++++----
 src/share/vm/code/nmethod.cpp          | 2 +-
 src/share/vm/oops/methodOop.cpp        | 2 +-
 src/share/vm/shark/sharkCompiler.hpp   | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cpu/zero/vm/interpreterRT_zero.hpp b/src/cpu/zero/vm/interpreterRT_zero.hpp
index 692450210..5ff34d99b 100644
--- a/src/cpu/zero/vm/interpreterRT_zero.hpp
+++ b/src/cpu/zero/vm/interpreterRT_zero.hpp
@@ -92,15 +92,15 @@ class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
 
  public:
   SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
-    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()),
+    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
       _cb(buffer) {
-    _cb->set_code_end((address) (cif() + 1));
+    _cb->set_insts_end((address) (cif() + 1));
   }
 
  private:
   void push(intptr_t value) {
-    intptr_t *dst = (intptr_t *) _cb->code_end();
-    _cb->set_code_end((address) (dst + 1));
+    intptr_t *dst = (intptr_t *) _cb->insts_end();
+    _cb->set_insts_end((address) (dst + 1));
     *dst = value;
   }
 };
diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
index 9da564d27..f7a2b7ff0 100644
--- a/src/share/vm/code/nmethod.cpp
+++ b/src/share/vm/code/nmethod.cpp
@@ -1421,7 +1421,7 @@ void nmethod::flush() {
   }
 
 #ifdef SHARK
-  ((SharkCompiler *) compiler())->free_compiled_method(instructions_begin());
+  ((SharkCompiler *) compiler())->free_compiled_method(insts_begin());
 #endif // SHARK
 
   ((CodeBlob*)(this))->flush();
diff --git a/src/share/vm/oops/methodOop.cpp b/src/share/vm/oops/methodOop.cpp
index 353a5f676..89a99c987 100644
--- a/src/share/vm/oops/methodOop.cpp
+++ b/src/share/vm/oops/methodOop.cpp
@@ -758,7 +758,7 @@ void methodOopDesc::set_code(methodHandle mh, nmethod *code) {
 
   OrderAccess::storestore();
 #ifdef SHARK
-  mh->_from_interpreted_entry = code->instructions_begin();
+  mh->_from_interpreted_entry = code->insts_begin();
 #else
   mh->_from_compiled_entry = code->verified_entry_point();
   OrderAccess::storestore();
diff --git a/src/share/vm/shark/sharkCompiler.hpp b/src/share/vm/shark/sharkCompiler.hpp
index ddac63152..be47dd529 100644
--- a/src/share/vm/shark/sharkCompiler.hpp
+++ b/src/share/vm/shark/sharkCompiler.hpp
@@ -103,8 +103,7 @@ class SharkCompiler : public AbstractCompiler {
   // Global access
  public:
   static SharkCompiler* compiler() {
-    AbstractCompiler *compiler =
-      CompileBroker::compiler(CompLevel_fast_compile);
+    AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_simple);
     assert(compiler->is_shark() && compiler->is_initialized(), "should be");
     return (SharkCompiler *) compiler;
   }
-- 
GitLab