Mercurial > hg > truffle
diff src/share/vm/opto/memnode.cpp @ 17790:5da8bb64b370
Merge
author | kvn |
---|---|
date | Mon, 23 Dec 2013 10:26:08 -0800 |
parents | 50fdb38839eb b87211e33ebb |
children | a9becfeecd1b |
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.cpp Thu Dec 12 11:05:39 2013 -0800 +++ b/src/share/vm/opto/memnode.cpp Mon Dec 23 10:26:08 2013 -0800 @@ -2075,6 +2075,11 @@ if (t != NULL) { // constant oop => constant klass if (offset == java_lang_Class::array_klass_offset_in_bytes()) { + if (t->is_void()) { + // We cannot create a void array. Since void is a primitive type return null + // klass. Users of this result need to do a null check on the returned klass. + return TypePtr::NULL_PTR; + } return TypeKlassPtr::make(ciArrayKlass::make(t)); } if (!t->is_klass()) {