Mercurial > hg > truffle

comparison src/share/vm/opto/memnode.cpp @ 17790:5da8bb64b370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Mon, 23 Dec 2013 10:26:08 -0800
parents 50fdb38839eb b87211e33ebb
children a9becfeecd1b
comparison
equal deleted inserted replaced
14447:2da20f966936 17790:5da8bb64b370
2073 ciType* t = tinst->java_mirror_type(); 2073 ciType* t = tinst->java_mirror_type();
2074 // java_mirror_type returns non-null for compile-time Class constants. 2074 // java_mirror_type returns non-null for compile-time Class constants.
2075 if (t != NULL) { 2075 if (t != NULL) {
2076 // constant oop => constant klass 2076 // constant oop => constant klass
2077 if (offset == java_lang_Class::array_klass_offset_in_bytes()) { 2077 if (offset == java_lang_Class::array_klass_offset_in_bytes()) {
2078 if (t->is_void()) {
2079 // We cannot create a void array. Since void is a primitive type return null
2080 // klass. Users of this result need to do a null check on the returned klass.
2081 return TypePtr::NULL_PTR;
2082 }
2078 return TypeKlassPtr::make(ciArrayKlass::make(t)); 2083 return TypeKlassPtr::make(ciArrayKlass::make(t));
2079 } 2084 }
2080 if (!t->is_klass()) { 2085 if (!t->is_klass()) {
2081 // a primitive Class (e.g., int.class) has NULL for a klass field 2086 // a primitive Class (e.g., int.class) has NULL for a klass field
2082 return TypePtr::NULL_PTR; 2087 return TypePtr::NULL_PTR;