src/hotspot/share/adlc/formssel.cpp

@@ -776,10 +776,11 @@
         !strcmp(_matrule->_rChild->_opType,"CastFF")       ||
         !strcmp(_matrule->_rChild->_opType,"CastII")       ||
         !strcmp(_matrule->_rChild->_opType,"CastLL")       ||
         !strcmp(_matrule->_rChild->_opType,"CastVV")       ||
         !strcmp(_matrule->_rChild->_opType,"CastX2P")      ||  // new result type
+        !strcmp(_matrule->_rChild->_opType,"CastI2N")      ||
         !strcmp(_matrule->_rChild->_opType,"DecodeN")      ||
         !strcmp(_matrule->_rChild->_opType,"EncodeP")      ||
         !strcmp(_matrule->_rChild->_opType,"DecodeNKlass") ||
         !strcmp(_matrule->_rChild->_opType,"EncodePKlass") ||
         !strcmp(_matrule->_rChild->_opType,"LoadN")        ||

@@ -806,11 +807,11 @@
    if (needs_base_oop_edge(globals)) return true;
  
    if (is_vector()) return true;
    if (is_mach_constant()) return true;
  
-   return  false;
+   return false;
  }
  
  
  // Access instr_cost attribute or return null.
  const char* InstructForm::cost() {

@@ -897,11 +898,12 @@
        strcmp(_matrule->_opType,"Rethrow"   )==0 ||
        strcmp(_matrule->_opType,"TailCall"  )==0 ||
        strcmp(_matrule->_opType,"TailJump"  )==0 ||
        strcmp(_matrule->_opType,"ForwardException")==0 ||
        strcmp(_matrule->_opType,"SafePoint" )==0 ||
-       strcmp(_matrule->_opType,"Halt"      )==0 )
+       strcmp(_matrule->_opType,"Halt"      )==0 ||
+       strcmp(_matrule->_opType,"CallLeafNoFP")==0)
      return AdlcVMDeps::Parms;   // Skip the machine-state edges
  
    if( _matrule->_rChild &&
        ( strcmp(_matrule->_rChild->_opType,"AryEq"     )==0 ||
          strcmp(_matrule->_rChild->_opType,"VectorizedHashCode")==0 ||

@@ -3641,11 +3643,11 @@
    if (_rChild) f->do_form(_rChild);
  }
  
  int MatchNode::needs_ideal_memory_edge(FormDict &globals) const {
    static const char *needs_ideal_memory_list[] = {
-     "StoreI","StoreL","StoreP","StoreN","StoreNKlass","StoreD","StoreF" ,
+     "StoreI","StoreL","StoreLSpecial","StoreP","StoreN","StoreNKlass","StoreD","StoreF" ,
      "StoreB","StoreC","Store" ,"StoreFP",
      "LoadI", "LoadL", "LoadP" ,"LoadN", "LoadD" ,"LoadF"  ,
      "LoadB" , "LoadUB", "LoadUS" ,"LoadS" ,"Load" ,
      "StoreVector", "LoadVector", "LoadVectorMasked", "StoreVectorMasked",
      "LoadVectorGather", "StoreVectorScatter", "LoadVectorGatherMasked", "StoreVectorScatterMasked",