stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8231430: C2: Memory stomp in max_array_length() for T_ILLEGAL type

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Vladimir Ivanov 2019-12-03 20:13:16 +03:00
parent 22ea33cf7a
commit c7bc0f7a12
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hotspot/share/opto/type.cpp
View File

@ -4104,32 +4104,22 @@ const TypeOopPtr *TypeAryPtr::cast_to_nonconst() const {
}
//-----------------------------narrow_size_type-------------------------------
// Local cache for arrayOopDesc::max_array_length(etype),
// which is kind of slow (and cached elsewhere by other users).
static jint max_array_length_cache[T_CONFLICT+1];
static jint max_array_length(BasicType etype) {
jint& cache = max_array_length_cache[etype];
jint res = cache;
if (res == 0) {
switch (etype) {
case T_NARROWOOP:
//-----------------------------max_array_length-------------------------------
// A wrapper around arrayOopDesc::max_array_length(etype) with some input normalization.
jint TypeAryPtr::max_array_length(BasicType etype) {
if (!is_java_primitive(etype) && !is_reference_type(etype)) {
if (etype == T_NARROWOOP) {
etype = T_OBJECT;
break;
case T_NARROWKLASS:
case T_CONFLICT:
case T_ILLEGAL:
case T_VOID:
etype = T_BYTE; // will produce conservatively high value
break;
default:
break;
} else if (etype == T_ILLEGAL) { // bottom[]
etype = T_BYTE; // will produce conservatively high value
} else {
fatal("not an element type: %s", type2name(etype));
}
cache = res = arrayOopDesc::max_array_length(etype);
}
return res;
return arrayOopDesc::max_array_length(etype);
}
//-----------------------------narrow_size_type-------------------------------
// Narrow the given size type to the index range for the given array base type.
// Return NULL if the resulting int type becomes empty.
const TypeInt* TypeAryPtr::narrow_size_type(const TypeInt* size) const {

3
src/hotspot/share/opto/type.hpp
View File

@ -455,7 +455,6 @@ public:
private:
// support arrays
static const BasicType _basic_type[];
static const Type* _zero_type[T_CONFLICT+1];
static const Type* _const_basic_type[T_CONFLICT+1];
};
@ -1225,6 +1224,8 @@ public:
const TypeAryPtr* cast_to_autobox_cache(bool cache) const;
static jint max_array_length(BasicType etype) ;
// Convenience common pre-built types.
static const TypeAryPtr *RANGE;
static const TypeAryPtr *OOPS;