changeset in /hg/icedtea: 2009-04-27 Gary Benson <gbenson at redh...

[Gary Benson]

changeset ee08e16e223e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee08e16e223e
description:
	2009-04-27  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkState.hpp
		(SharkState::SharkState): Add explicit block argument.
		(SharkState::copy): Pass block to constructor.
		* ports/hotspot/src/share/vm/shark/sharkState.cpp
		(SharkState::SharkState): Add explicit block argument.
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::initial_current_state): Pass block to
		SharkState constructor.

diffstat:

4 files changed, 16 insertions(+), 5 deletions(-)
ChangeLog                                       |   11 +++++++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |    2 +-
ports/hotspot/src/share/vm/shark/sharkState.cpp |    4 ++--
ports/hotspot/src/share/vm/shark/sharkState.hpp |    4 ++--

diffs (65 lines):

diff -r 28c8fa90206c -r ee08e16e223e ChangeLog
--- a/ChangeLog	Thu Apr 23 16:59:47 2009 +0200
+++ b/ChangeLog	Mon Apr 27 05:35:03 2009 -0400
@@ -1,3 +1,14 @@ 2009-04-23 Xerxes RÃ¥nby <xerxes at zafena.
+2009-04-27  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp
+	(SharkState::SharkState): Add explicit block argument.
+	(SharkState::copy): Pass block to constructor.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp
+	(SharkState::SharkState): Add explicit block argument.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::initial_current_state): Pass block to
+	SharkState constructor.
+
 2009-04-23 Xerxes RÃ¥nby <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Thu Apr 23 16:59:47 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Mon Apr 27 05:35:03 2009 -0400
@@ -853,7 +853,7 @@ void SharkBlock::parse_bytecode(int star
 
 SharkState* SharkBlock::initial_current_state()
 {
-  return new SharkState(entry_state());
+  return new SharkState(this, entry_state());
 }
 
 int SharkBlock::switch_default_dest()
diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkState.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.cpp	Thu Apr 23 16:59:47 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp	Mon Apr 27 05:35:03 2009 -0400
@@ -38,8 +38,8 @@ SharkState::SharkState(SharkBlock*    bl
   initialize(NULL);
 }
 
-SharkState::SharkState(const SharkState* state)
-  : _block(state->block()),
+SharkState::SharkState(SharkBlock* block, const SharkState* state)
+  : _block(block),
     _function(state->function()),
     _method(state->method())
 {
diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkState.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.hpp	Thu Apr 23 16:59:47 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp	Mon Apr 27 05:35:03 2009 -0400
@@ -32,7 +32,7 @@ class SharkState : public ResourceObj {
   SharkState(SharkBlock*    block,
              SharkFunction* function = NULL,
              llvm::Value*   method = NULL);
-  SharkState(const SharkState* state);
+  SharkState(SharkBlock* block, const SharkState* state);
 
  private:
   void initialize(const SharkState* state);
@@ -137,7 +137,7 @@ class SharkState : public ResourceObj {
  public:
   SharkState* copy() const
   {
-    return new SharkState(this);
+    return new SharkState(block(), this);
   }
   void merge(SharkState*       other,
              llvm::BasicBlock* other_block,