diff mbox

RFR: Fix false assertion failure (resend)

Message ID 1375696262.1953.9.camel@fleetfoot.lan
State Accepted
Headers show

Commit Message

Edward Nevill Aug. 5, 2013, 9:51 a.m. UTC 
Hi,

The following fixes a false assertion failue which triggers a failure
in mauve with fastdebug.

OK?

Ed.

--- CUT HERE ---
exporting patch:
# HG changeset patch
# User Edward Nevill ed@camswl.com
# Date 1375458644 -3600
# Node ID 6a6b3b5dc103536b9c04666219452fff6db5ec3e
# Parent  064f61f7d3a09ff01fd3f9b9fd193dc204fb7fd7
Fixed false assertion failure
diff mbox

Patch

diff -r 064f61f7d3a0 -r 6a6b3b5dc103 src/share/vm/runtime/reflection.cpp
--- a/src/share/vm/runtime/reflection.cpp       Fri Aug 02 10:10:28 2013 +0100
+++ b/src/share/vm/runtime/reflection.cpp       Fri Aug 02 16:50:44 2013 +0100
@@ -376,7 +376,8 @@ 
   }
   klass = klass->array_klass(dim, CHECK_NULL);
   oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD);
-  assert(obj->is_array(), "just checking");
+  // obj may be NULL is one of the dimensions is 0
+  assert(obj == NULL || obj->is_array(), "just checking");
   return arrayOop(obj);
 }
--- CUT HERE ---