8254888: [lworld] Remove dead code from array property checking

Author: TobiHartmann

src/hotspot/cpu/aarch64/aarch64.ad

@@ -8727,37 +8727,6 @@ instruct castP2X(iRegLNoSp dst, iRegP src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct castN2I(iRegINoSp dst, iRegN src) %{
-  match(Set dst (CastN2I src));
-
-  ins_cost(INSN_COST);
-  format %{ "movw $dst, $src\t# compressed ptr -> int" %}
-
-  ins_encode %{
-    if ($dst$$reg != $src$$reg) {
-      __ movw(as_Register($dst$$reg), as_Register($src$$reg));
-    }
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-instruct castI2N(iRegNNoSp dst, iRegI src) %{
-  match(Set dst (CastI2N src));
-
-  ins_cost(INSN_COST);
-  format %{ "movw $dst, $src\t# int -> compressed ptr" %}
-
-  ins_encode %{
-    if ($dst$$reg != $src$$reg) {
-      __ movw(as_Register($dst$$reg), as_Register($src$$reg));
-    }
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-
 // Convert oop into int for vectors alignment masking
 instruct convP2I(iRegINoSp dst, iRegP src) %{
   match(Set dst (ConvL2I (CastP2X src)));

src/hotspot/cpu/x86/x86_64.ad

@@ -6659,33 +6659,6 @@ instruct castP2X(rRegL dst, rRegP src)
   ins_pipe(ialu_reg_reg); // XXX
 %}
 
-instruct castN2I(rRegI dst, rRegN src)
-%{
-  match(Set dst (CastN2I src));
-
-  format %{ "movl    $dst, $src\t# compressed ptr -> int" %}
-  ins_encode %{
-    if ($dst$$reg != $src$$reg) {
-      __ movl($dst$$Register, $src$$Register);
-    }
-  %}
-  ins_pipe(ialu_reg_reg); // XXX
-%}
-
-instruct castI2N(rRegN dst, rRegI src)
-%{
-  match(Set dst (CastI2N src));
-
-  format %{ "movl    $dst, $src\t# int -> compressed ptr" %}
-  ins_encode %{
-    if ($dst$$reg != $src$$reg) {
-      __ movl($dst$$Register, $src$$Register);
-    }
-  %}
-  ins_pipe(ialu_reg_reg); // XXX
-%}
-
-
 // Convert oop into int for vectors alignment masking
 instruct convP2I(rRegI dst, rRegP src)
 %{
@@ -11512,17 +11485,6 @@ instruct testI_reg_mem(rFlagsReg cr, rRegI src, memory mem, immI0 zero)
   ins_pipe(ialu_cr_reg_mem);
 %}
 
-// Fold array properties check
-instruct testI_mem_imm(rFlagsReg cr, memory mem, immI con, immI0 zero)
-%{
-  match(Set cr (CmpI (AndI (CastN2I (LoadNKlass mem)) con) zero));
-
-  format %{ "testl   $mem, $con" %}
-  opcode(0xF7, 0x00);
-  ins_encode(REX_mem(mem), OpcP, RM_opc_mem(0x00, mem), Con32(con));
-  ins_pipe(ialu_mem_imm);
-%}
-
 // Unsigned compare Instructions; really, same as signed except they
 // produce an rFlagsRegU instead of rFlagsReg.
 instruct compU_rReg(rFlagsRegU cr, rRegI op1, rRegI op2)
@@ -11835,17 +11797,6 @@ instruct testL_reg_mem2(rFlagsReg cr, rRegP src, memory mem, immL0 zero)
   ins_pipe(ialu_cr_reg_mem);
 %}
 
-// Fold array properties check
-instruct testL_reg_mem3(rFlagsReg cr, memory mem, rRegL src, immL0 zero)
-%{
-  match(Set cr (CmpL (AndL (CastP2X (LoadKlass mem)) src) zero));
-
-  format %{ "testq   $src, $mem\t# test array properties" %}
-  opcode(0x85);
-  ins_encode(REX_reg_mem_wide(src, mem), OpcP, reg_mem(src, mem));
-  ins_pipe(ialu_cr_reg_mem);
-%}
-
 // Manifest a CmpL result in an integer register.  Very painful.
 // This is the test to avoid.
 instruct cmpL3_reg_reg(rRegI dst, rRegL src1, rRegL src2, rFlagsReg flags)

src/hotspot/share/adlc/formssel.cpp

@@ -763,7 +763,6 @@ bool InstructForm::captures_bottom_type(FormDict &globals) const {
   if (_matrule && _matrule->_rChild &&
       (!strcmp(_matrule->_rChild->_opType,"CastPP")       ||  // new result type
        !strcmp(_matrule->_rChild->_opType,"CastX2P")      ||  // new result type
-       !strcmp(_matrule->_rChild->_opType,"CastI2N")      ||  // new result type
        !strcmp(_matrule->_rChild->_opType,"DecodeN")      ||
        !strcmp(_matrule->_rChild->_opType,"EncodeP")      ||
        !strcmp(_matrule->_rChild->_opType,"DecodeNKlass") ||

src/hotspot/share/opto/castnode.hpp

@@ -149,23 +149,4 @@ class CastP2XNode : public Node {
   virtual bool depends_only_on_test() const { return false; }
 };
 
-// convert between a 32 bit integer and a compressed pointer
-class CastI2NNode : public TypeNode {
-  public:
-  CastI2NNode(Node *n, const Type *t) : TypeNode(t, 2) {
-    init_req(1, n);
-  }
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegN; }
-};
-
-class CastN2INode : public Node {
-  public:
-  CastN2INode(Node *n) : Node(NULL, n) {}
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegI; }
-  virtual const Type *bottom_type() const { return TypeInt::INT; }
-};
-
-
 #endif // SHARE_OPTO_CASTNODE_HPP

src/hotspot/share/opto/classes.hpp

@@ -63,8 +63,6 @@ macro(CallStaticJava)
 macro(CastII)
 macro(CastX2P)
 macro(CastP2X)
-macro(CastI2N)
-macro(CastN2I)
 macro(CastPP)
 macro(Catch)
 macro(CatchProj)

src/hotspot/share/runtime/vmStructs.cpp

@@ -1576,11 +1576,9 @@ typedef HashtableEntry<InstanceKlass*, mtClass>  KlassHashtableEntry;
   declare_c2_type(ConvI2DNode, Node)                                      \
   declare_c2_type(ConvI2FNode, Node)                                      \
   declare_c2_type(ConvI2LNode, TypeNode)                                  \
-  declare_c2_type(CastI2NNode, TypeNode)                                  \
   declare_c2_type(ConvL2DNode, Node)                                      \
   declare_c2_type(ConvL2FNode, Node)                                      \
   declare_c2_type(ConvL2INode, Node)                                      \
-  declare_c2_type(CastN2INode, Node)                                      \
   declare_c2_type(CastX2PNode, Node)                                      \
   declare_c2_type(CastP2XNode, Node)                                      \
   declare_c2_type(SetVectMaskINode, Node)                                 \