changeset in /hg/icedtea6: 2009-02-27 Gary Benson <gbenson at red...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::maybe_inline_accessor): Remove a hack

diffstat:

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

diffs (34 lines):

diff -r 9f1c16638724 -r ffde78306a6a ChangeLog
--- a/ChangeLog	Fri Feb 27 14:52:57 2009 +0000
+++ b/ChangeLog	Fri Feb 27 14:55:51 2009 +0000
@@ -1,3 +1,8 @@ 2009-02-27  Gary Benson  <gbenson at redhat
+2009-02-27  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::maybe_inline_accessor): Remove a hack
+
 2009-02-27  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkState.cpp
diff -r 9f1c16638724 -r ffde78306a6a ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Feb 27 14:52:57 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Feb 27 14:55:51 2009 +0000
@@ -2197,12 +2197,12 @@ bool SharkBlock::maybe_inline_accessor(c
   // entering the inlined section.  For the majority of accessors
   // this has already been done (in do_call) but if the accessor
   // was invoked by invokestatic (eg synthetic accessors) then it
-  // won't have been checked and do_field_access will try to do
-  // it and fail.  So we check here, which is moderately wrong in
-  // that the NullPointerException will have been thrown by the
-  // caller rather than the callee.
-  if (is_field)
-    check_null(xstack(0));
+  // may not have been checked and do_field_access will try to do
+  // it and fail.
+  if (is_field) {
+    if (!xstack(0)->zero_checked())
+      return false;
+  }
   
   current_state()->enter_inlined_section();
   do_field_access(is_get, is_field, field);