src/hotspot/share/opto/type.cpp

*** 602,612 ****
    TypeNarrowOop::NULL_PTR = TypeNarrowOop::make( TypePtr::NULL_PTR );
    TypeNarrowOop::BOTTOM   = TypeNarrowOop::make( TypeInstPtr::BOTTOM );
  
    TypeNarrowKlass::NULL_PTR = TypeNarrowKlass::make( TypePtr::NULL_PTR );
  
!   TypeValueTypePtr::NOTNULL = (EnableValhalla || EnableMVT) ? TypeValueTypePtr::make(TypePtr::NotNull, current->env()->___Value_klass()->as_value_klass()) : NULL;
  
    mreg2type[Op_Node] = Type::BOTTOM;
    mreg2type[Op_Set ] = 0;
    mreg2type[Op_RegN] = TypeNarrowOop::BOTTOM;
    mreg2type[Op_RegI] = TypeInt::INT;
--- 602,613 ----
    TypeNarrowOop::NULL_PTR = TypeNarrowOop::make( TypePtr::NULL_PTR );
    TypeNarrowOop::BOTTOM   = TypeNarrowOop::make( TypeInstPtr::BOTTOM );
  
    TypeNarrowKlass::NULL_PTR = TypeNarrowKlass::make( TypePtr::NULL_PTR );
  
!   // TypeValueTypePtr::NOTNULL = (EnableValhalla || EnableMVT) ? TypeValueTypePtr::make(TypePtr::NotNull, current->env()->___Value_klass()->as_value_klass()) : NULL;
!   TypeValueTypePtr::NOTNULL = NULL;
  
    mreg2type[Op_Node] = Type::BOTTOM;
    mreg2type[Op_Set ] = 0;
    mreg2type[Op_RegN] = TypeNarrowOop::BOTTOM;
    mreg2type[Op_RegI] = TypeInt::INT;
*** 640,650 ****
  
    // Nobody should ask _array_body_type[T_NARROWOOP]. Use NULL as assert.
    TypeAryPtr::_array_body_type[T_NARROWOOP] = NULL;
    TypeAryPtr::_array_body_type[T_OBJECT]  = TypeAryPtr::OOPS;
    TypeAryPtr::_array_body_type[T_ARRAY]   = TypeAryPtr::OOPS; // arrays are stored in oop arrays
-   TypeAryPtr::_array_body_type[T_VALUETYPE] = TypeAryPtr::OOPS;
    TypeAryPtr::_array_body_type[T_VALUETYPEPTR] = NULL;
    TypeAryPtr::_array_body_type[T_BYTE]    = TypeAryPtr::BYTES;
    TypeAryPtr::_array_body_type[T_BOOLEAN] = TypeAryPtr::BYTES;  // boolean[] is a byte array
    TypeAryPtr::_array_body_type[T_SHORT]   = TypeAryPtr::SHORTS;
    TypeAryPtr::_array_body_type[T_CHAR]    = TypeAryPtr::CHARS;
--- 641,650 ----
*** 654,664 ****
    TypeAryPtr::_array_body_type[T_DOUBLE]  = TypeAryPtr::DOUBLES;
  
    TypeKlassPtr::OBJECT = TypeKlassPtr::make(TypePtr::NotNull, current->env()->Object_klass(), Offset(0) );
    TypeKlassPtr::OBJECT_OR_NULL = TypeKlassPtr::make(TypePtr::BotPTR, current->env()->Object_klass(), Offset(0) );
    TypeKlassPtr::BOTTOM = (EnableValhalla || EnableMVT) ? TypeKlassPtr::make(TypePtr::BotPTR, NULL, Offset(0)) : TypeKlassPtr::OBJECT_OR_NULL;
!   TypeKlassPtr::VALUE = TypeKlassPtr::make(TypePtr::NotNull, current->env()->___Value_klass(), Offset(0));
  
    const Type **fi2c = TypeTuple::fields(2);
    fi2c[TypeFunc::Parms+0] = TypeInstPtr::BOTTOM; // Method*
    fi2c[TypeFunc::Parms+1] = TypeRawPtr::BOTTOM; // argument pointer
    TypeTuple::START_I2C = TypeTuple::make(TypeFunc::Parms+2, fi2c);
--- 654,665 ----
    TypeAryPtr::_array_body_type[T_DOUBLE]  = TypeAryPtr::DOUBLES;
  
    TypeKlassPtr::OBJECT = TypeKlassPtr::make(TypePtr::NotNull, current->env()->Object_klass(), Offset(0) );
    TypeKlassPtr::OBJECT_OR_NULL = TypeKlassPtr::make(TypePtr::BotPTR, current->env()->Object_klass(), Offset(0) );
    TypeKlassPtr::BOTTOM = (EnableValhalla || EnableMVT) ? TypeKlassPtr::make(TypePtr::BotPTR, NULL, Offset(0)) : TypeKlassPtr::OBJECT_OR_NULL;
!   // TypeKlassPtr::VALUE = TypeKlassPtr::make(TypePtr::NotNull, current->env()->___Value_klass(), Offset(0));
!   TypeKlassPtr::VALUE = NULL;
  
    const Type **fi2c = TypeTuple::fields(2);
    fi2c[TypeFunc::Parms+0] = TypeInstPtr::BOTTOM; // Method*
    fi2c[TypeFunc::Parms+1] = TypeRawPtr::BOTTOM; // argument pointer
    TypeTuple::START_I2C = TypeTuple::make(TypeFunc::Parms+2, fi2c);
*** 694,704 ****
    _const_basic_type[T_FLOAT]       = Type::FLOAT;
    _const_basic_type[T_DOUBLE]      = Type::DOUBLE;
    _const_basic_type[T_OBJECT]      = TypeInstPtr::BOTTOM;
    _const_basic_type[T_VALUETYPEPTR]= TypeInstPtr::BOTTOM;
    _const_basic_type[T_ARRAY]       = TypeInstPtr::BOTTOM; // there is no separate bottom for arrays
-   _const_basic_type[T_VALUETYPE]   = TypeInstPtr::BOTTOM;
    _const_basic_type[T_VOID]        = TypePtr::NULL_PTR;   // reflection represents void this way
    _const_basic_type[T_ADDRESS]     = TypeRawPtr::BOTTOM;  // both interpreter return addresses & random raw ptrs
    _const_basic_type[T_CONFLICT]    = Type::BOTTOM;        // why not?
  
    _zero_type[T_NARROWOOP]   = TypeNarrowOop::NULL_PTR;
--- 695,704 ----
*** 712,722 ****
    _zero_type[T_FLOAT]       = TypeF::ZERO;
    _zero_type[T_DOUBLE]      = TypeD::ZERO;
    _zero_type[T_OBJECT]      = TypePtr::NULL_PTR;
    _zero_type[T_VALUETYPEPTR]= TypePtr::NULL_PTR;
    _zero_type[T_ARRAY]       = TypePtr::NULL_PTR; // null array is null oop
-   _zero_type[T_VALUETYPE]   = TypePtr::NULL_PTR;
    _zero_type[T_ADDRESS]     = TypePtr::NULL_PTR; // raw pointers use the same null
    _zero_type[T_VOID]        = Type::TOP;         // the only void value is no value at all
  
    // get_zero_type() should not happen for T_CONFLICT
    _zero_type[T_CONFLICT]= NULL;
--- 712,721 ----