changeset in /hg/icedtea6: 2008-10-17 Gary Benson <gbenson at red...

[Gary Benson]

changeset be5fa1722f4f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be5fa1722f4f
description:
	2008-10-17  Gary Benson  <gbenson at redhat.com>

		PR icedtea/203:
		* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
		(SharkDecacher::start_stack): Always set the stack pointer.
		(SharkCacher::start_stack): Removed.
		* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
		(SharkCacher::start_stack): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
		(SharkFunction::CreateBuildFrame): Only set the stack pointer
		for non-product builds.

diffstat:

4 files changed, 19 insertions(+), 22 deletions(-)
ChangeLog                                              |   12 +++++++
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp |   26 +++-------------
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp |    1 
ports/hotspot/src/share/vm/shark/sharkFunction.cpp     |    2 -

diffs (85 lines):

diff -r ad32e49ddfdf -r be5fa1722f4f ChangeLog
--- a/ChangeLog	Fri Oct 17 05:16:39 2008 -0400
+++ b/ChangeLog	Fri Oct 17 10:37:37 2008 -0400
@@ -1,3 +1,15 @@ 2008-10-17  Gary Benson  <gbenson at redhat
+2008-10-17  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/203:
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+	(SharkDecacher::start_stack): Always set the stack pointer.
+	(SharkCacher::start_stack): Removed.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+	(SharkCacher::start_stack): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::CreateBuildFrame): Only set the stack pointer
+	for non-product builds.
+
 2008-10-17  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (FIND_LIBGCJ_JAR): Fix quoting.
diff -r ad32e49ddfdf -r be5fa1722f4f ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Fri Oct 17 05:16:39 2008 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Fri Oct 17 10:37:37 2008 -0400
@@ -43,14 +43,12 @@ void SharkDecacher::start_stack(int num_
   // Create the array we'll record our stack slots in
   _exparray = new GrowableArray<ScopeValue*>(num_slots);
 
-  // Trim back the stack if necessary
-  if (num_slots != max_slots) {
-    function()->CreateStoreZeroStackPointer(
-      builder()->CreatePtrToInt(
-        function()->CreateAddressOfFrameEntry(
-          function()->stack_slots_offset() + max_slots - num_slots),
-        SharkType::intptr_type()));
-  }
+  // Set the stack pointer
+  function()->CreateStoreZeroStackPointer(
+    builder()->CreatePtrToInt(
+      function()->CreateAddressOfFrameEntry(
+        function()->stack_slots_offset() + max_slots - num_slots),
+      SharkType::intptr_type()));
 }
 
 void SharkDecacher::process_stack_slot(int          index,
@@ -169,18 +167,6 @@ void SharkDecacher::end_frame()
   debug_info()->end_safepoint(pc_offset());
 }
 
-void SharkCacher::start_stack(int num_slots, int max_slots)
-{
-  // Restore the stack if necessary
-  if (num_slots != max_slots) {
-    function()->CreateStoreZeroStackPointer(
-      builder()->CreatePtrToInt(
-        function()->CreateAddressOfFrameEntry(
-          function()->stack_slots_offset()),
-        SharkType::intptr_type()));
-  }
-}
-
 void SharkCacher::process_stack_slot(int          index,
                                      SharkValue** addr,
                                      int          offset)
diff -r ad32e49ddfdf -r be5fa1722f4f ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Fri Oct 17 05:16:39 2008 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Fri Oct 17 10:37:37 2008 -0400
@@ -297,7 +297,6 @@ class SharkCacher : public SharkCacherDe
 
   // Callbacks
  protected:
-  void start_stack(int num_slots, int max_slots);
   void process_stack_slot(int index, SharkValue** value, int offset);
 
   void process_method_slot(llvm::Value** value, int offset);
diff -r ad32e49ddfdf -r be5fa1722f4f ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Oct 17 05:16:39 2008 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Oct 17 10:37:37 2008 -0400
@@ -213,7 +213,7 @@ Value* SharkFunction::CreateBuildFrame()
     CreateLoadZeroStackPointer(),
     LLVMValue::intptr_constant((frame_words + extra_locals) * wordSize));
   CreateStackOverflowCheck(zero_stack_pointer);
-  CreateStoreZeroStackPointer(zero_stack_pointer);
+  NOT_PRODUCT(CreateStoreZeroStackPointer(zero_stack_pointer));
 
   // Create the frame
   _frame = builder()->CreateIntToPtr(