Mercurial > hg > release > icedtea6-1.3
changeset 1076:ab8aa9425fc4
2008-10-07 Gary Benson <gbenson@redhat.com>
Andrew Haley <aph@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.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Tue, 07 Oct 2008 11:16:16 -0400 |
| parents | e4575e17609d |
| children | 86fbcf148d1f |
| files | ChangeLog ports/hotspot/build/linux/makefiles/shark.make ports/hotspot/src/share/vm/shark/sharkMonitor.hpp |
| diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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 Gary Benson <gbenson@redhat.com> + Andrew Haley <aph@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@ubuntu.com> * Makefile.am: Don't rely on versioned cacao source directory.
--- 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 @@ 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
--- 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 @@ 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 @@ } 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 {