src/hotspot/share/classfile/verificationType.hpp

@@ -66,16 +66,16 @@
        ITEM_Long_2nd, ITEM_Double_2nd
      };
  
      // Enum for the _data field
      enum : uint {
-       // Bottom two bits determine if the type is a reference, primitive,
-       // uninitialized or a query-type.
-       TypeMask           = 0x00000003,
+       // Bottom three bits determine if the type is a reference, inline type,
+       // primitive, uninitialized or a query-type.
+       TypeMask           = 0x00000007,
  
        // Topmost types encoding
-       Reference          = 0x0,        // _sym contains the name
+       Reference          = 0x0,        // _sym contains the name of an object
        Primitive          = 0x1,        // see below for primitive list
        Uninitialized      = 0x2,        // 0x00ffff00 contains bci
        TypeQuery          = 0x3,        // Meta-types used for category testing
  
        // Utility flags

@@ -112,11 +112,11 @@
  
        // Query values
        ReferenceQuery     = (ReferenceFlag     << 1 * BitsPerByte) | TypeQuery,
        Category1Query     = (Category1Flag     << 1 * BitsPerByte) | TypeQuery,
        Category2Query     = (Category2Flag     << 1 * BitsPerByte) | TypeQuery,
-       Category2_2ndQuery = (Category2_2ndFlag << 1 * BitsPerByte) | TypeQuery
+       Category2_2ndQuery = (Category2_2ndFlag << 1 * BitsPerByte) | TypeQuery,
      };
  
    VerificationType(uintptr_t raw_data) {
      _u._data = raw_data;
    }

@@ -154,11 +154,11 @@
    static VerificationType category2_2nd_check()
      { return VerificationType(Category2_2ndQuery); }
  
    // For reference types, store the actual Symbol
    static VerificationType reference_type(Symbol* sh) {
-       assert(((uintptr_t)sh & 0x3) == 0, "Symbols must be aligned");
+       assert(((uintptr_t)sh & TypeMask) == 0, "Symbols must be aligned");
        // If the above assert fails in the future because oop* isn't aligned,
        // then this type encoding system will have to change to have a tag value
        // to discriminate between oops and primitives.
        return VerificationType((uintptr_t)sh);
    }

@@ -183,12 +183,12 @@
    bool is_long2() const     { return (_u._data == Long_2nd); }
    bool is_double2() const   { return (_u._data == Double_2nd); }
    bool is_reference() const { return ((_u._data & TypeMask) == Reference); }
    bool is_category1() const {
      // This should return true for all one-word types, which are category1
-     // primitives, and references (including uninitialized refs).  Though
-     // the 'query' types should technically return 'false' here, if we
+     // primitives, references (including uninitialized refs) and inline types.
+     // Though the 'query' types should technically return 'false' here, if we
      // allow this to return true, we can perform the test using only
      // 2 operations rather than 8 (3 masks, 3 compares and 2 logical 'ands').
      // Since no one should call this on a query type anyway, this is ok.
      assert(!is_check(), "Must not be a check type (wrong value returned)");
      return ((_u._data & Category1) != Primitive);

@@ -218,10 +218,12 @@
    bool is_double_array() const { return is_x_array(JVM_SIGNATURE_DOUBLE); }
    bool is_object_array() const { return is_x_array(JVM_SIGNATURE_CLASS); }
    bool is_array_array() const { return is_x_array(JVM_SIGNATURE_ARRAY); }
    bool is_reference_array() const
      { return is_object_array() || is_array_array(); }
+   bool is_nonscalar_array() const
+     { return is_object_array() || is_array_array(); }
    bool is_object() const
      { return (is_reference() && !is_null() && name()->utf8_length() >= 1 &&
                name()->char_at(0) != JVM_SIGNATURE_ARRAY); }
    bool is_array() const
      { return (is_reference() && !is_null() && name()->utf8_length() >= 2 &&

@@ -240,18 +242,19 @@
      assert(is_uninitialized(), "Must be uninitialized type");
      return ((_u._data & BciMask) >> 1 * BitsPerByte);
    }
  
    Symbol* name() const {
-     assert(is_reference() && !is_null(), "Must be a non-null reference");
+     assert(!is_null() && is_reference(), "Must be a non-null reference");
      return _u._sym;
    }
  
    bool equals(const VerificationType& t) const {
      return (_u._data == t._u._data ||
-       (is_reference() && t.is_reference() && !is_null() && !t.is_null() &&
-        name() == t.name()));
+             (((is_reference() && t.is_reference())) &&
+              !is_null() && !t.is_null() && name() == t.name()));
+ 
    }
  
    bool operator ==(const VerificationType& t) const {
      return equals(t);
    }