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

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkMonitor.hpp
		(object): Add missing return statement.
		(displaced_header): Likewise.

		* ports/hotspot/build/linux/makefiles/shark.make:
		Remove workaround for the above.

diffstat:

3 files changed, 12 insertions(+), 8 deletions(-)
ChangeLog                                         |   10 ++++++++++
ports/hotspot/build/linux/makefiles/shark.make    |    6 ------
ports/hotspot/src/share/vm/shark/sharkMonitor.hpp |    4 ++--

diffs (54 lines):

diff -r e4575e17609d -r ab8aa9425fc4 ChangeLog
--- a/ChangeLog	Tue Oct 07 14:11:49 2008 +0200
+++ b/ChangeLog	Tue Oct 07 11:16:16 2008 -0400
@@ -1,3 +1,13 @@ 2008-10-07  Matthias Klose  <doko at ubuntu
+2008-10-07  Gary Benson  <gbenson at redhat.com>
+	    Andrew Haley  <aph at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkMonitor.hpp
+	(object): Add missing return statement.
+	(displaced_header): Likewise.
+
+	* ports/hotspot/build/linux/makefiles/shark.make:
+	Remove workaround for the above.
+
 2008-10-07  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am: Don't rely on versioned cacao source directory.
diff -r e4575e17609d -r ab8aa9425fc4 ports/hotspot/build/linux/makefiles/shark.make
--- a/ports/hotspot/build/linux/makefiles/shark.make	Tue Oct 07 14:11:49 2008 +0200
+++ b/ports/hotspot/build/linux/makefiles/shark.make	Tue Oct 07 11:16:16 2008 -0400
@@ -31,12 +31,6 @@ VM_SUBDIR = server
 
 CFLAGS += -DSHARK
 
-# Something these files fail with GCC at higher optimization levels.
-# An llvm::Value ends up NULL, causing segfaults in LLVM when it is
-# used.  Observed with 4.1.2 20070925 (Red Hat 4.1.2-33) and 4.3.2.
-OPT_CFLAGS/sharkBlock.o = -O0
-OPT_CFLAGS/sharkMonitor.o = -O0
-
 # Something in this file fails with GCC at higher optimization levels.
 # The part of ciTypeFlow::StateVector::meet_exception() that fills in
 # local variables stops part way through leaving the rest set to T_TOP
diff -r e4575e17609d -r ab8aa9425fc4 ports/hotspot/src/share/vm/shark/sharkMonitor.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMonitor.hpp	Tue Oct 07 14:11:49 2008 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkMonitor.hpp	Tue Oct 07 11:16:16 2008 -0400
@@ -67,7 +67,7 @@ class SharkMonitor : public ResourceObj 
  public:
   llvm::Value* object() const
   {
-    builder()->CreateLoad(object_addr());
+    return builder()->CreateLoad(object_addr());
   }
   void set_object(llvm::Value* object) const
   {
@@ -75,7 +75,7 @@ class SharkMonitor : public ResourceObj 
   }
   llvm::Value* displaced_header() const
   {
-    builder()->CreateLoad(displaced_header_addr());
+    return builder()->CreateLoad(displaced_header_addr());
   }
   void set_displaced_header(llvm::Value* displaced_header) const
   {