[aarch64-port-dev ] RFR: Fix false assertion failure

[Andrew Haley]

On 08/02/2013 04:55 PM, edward.nevill at linaro.org wrote:
> Hi,
> 
> The following fixes a false assertion failue which triggers a failure
> in mauve with fastdebug.
> 
> OK?

Yes, as corrected.

if this is in the current hotspot tree, please send the patch to hotspot-dev.

Andrew.



> --- CUT HERE ---
> exporting patch:
> # HG changeset patch
> # User Edward Nevill ed at camswl.com
> # Date 1375458644 -3600
> # Node ID 6a6b3b5dc103536b9c04666219452fff6db5ec3e
> # Parent  064f61f7d3a09ff01fd3f9b9fd193dc204fb7fd7
> Fixed false assertion failure
> 
> 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

if one of the dimensions is 0

> +  assert(obj == NULL || obj->is_array(), "just checking");
>    return arrayOop(obj);
>  }
> --- CUT HERE --- 
>