/hg/release/icedtea6-1.8: Fix PR icedtea/324

[xranby at icedtea.classpath.org]

changeset 16943314ca9a in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=16943314ca9a
author: Gary Benson <gbenson at redhat.com>
date: Fri Apr 30 10:24:39 2010 +0100

	Fix PR icedtea/324


diffstat:

2 files changed, 24 insertions(+), 14 deletions(-)
ChangeLog                                               |    8 ++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |   30 ++++++++-------

diffs (76 lines):

diff -r c8d38c28900e -r 16943314ca9a ChangeLog
--- a/ChangeLog	Wed Apr 28 17:18:35 2010 +0100
+++ b/ChangeLog	Fri Apr 30 10:24:39 2010 +0100
@@ -1,3 +1,11 @@ 2010-04-28  Andrew John Hughes  <ahughes
+2010-04-30  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/324
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::do_aload): Cope with cases where
+	the array's type is unknown.
+	(SharkTopLevelBlock::do_astore): Likewise.
+
 2010-04-28  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/476
diff -r c8d38c28900e -r 16943314ca9a ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Apr 28 17:18:35 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Fri Apr 30 10:24:39 2010 +0100
@@ -691,12 +691,6 @@ void SharkTopLevelBlock::do_aload(BasicT
   SharkValue *index = pop();
   SharkValue *array = pop();
 
-  assert(array->type()->is_array_klass(), "should be");
-  ciType *element_type = ((ciArrayKlass *) array->type())->element_type();
-  assert((element_type->basic_type() == T_BOOLEAN && basic_type == T_BYTE) ||
-         (element_type->basic_type() == T_ARRAY && basic_type == T_OBJECT) ||
-         (element_type->basic_type() == basic_type), "type mismatch");
-
   check_null(array);
   check_bounds(array, index);
 
@@ -729,7 +723,21 @@ void SharkTopLevelBlock::do_aload(BasicT
     break;
 
   case T_OBJECT:
-    push(SharkValue::create_generic(element_type, value, false));
+    // You might expect that array->type()->is_array_klass() would
+    // always be true, but it isn't.  If ciTypeFlow detects that a
+    // value is always null then that value becomes an untyped null
+    // object.  Shark doesn't presently support this, so a generic
+    // T_OBJECT is created.  In this case we guess the type using
+    // the BasicType we were supplied.  In reality the generated
+    // code will never be used, as the null value will be caught
+    // by the above null pointer check.
+    // http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=324
+    push(
+      SharkValue::create_generic(
+        array->type()->is_array_klass() ?
+          ((ciArrayKlass *) array->type())->element_type() :
+          ciType::make(basic_type),
+        value, false));
     break;
 
   default:
@@ -742,12 +750,6 @@ void SharkTopLevelBlock::do_astore(Basic
   SharkValue *svalue = pop();
   SharkValue *index  = pop();
   SharkValue *array  = pop();
-
-  assert(array->type()->is_array_klass(), "should be");
-  ciType *element_type = ((ciArrayKlass *) array->type())->element_type();
-  assert((element_type->basic_type() == T_BOOLEAN && basic_type == T_BYTE) ||
-         (element_type->basic_type() == T_ARRAY && basic_type == T_OBJECT) ||
-         (element_type->basic_type() == basic_type), "type mismatch");
 
   check_null(array);
   check_bounds(array, index);
@@ -792,7 +794,7 @@ void SharkTopLevelBlock::do_astore(Basic
 
   builder()->CreateStore(value, addr);
 
-  if (!element_type->is_primitive_type())
+  if (basic_type == T_OBJECT) // XXX or T_ARRAY?
     builder()->CreateUpdateBarrierSet(oopDesc::bs(), addr);
 }