Merge pull request #6401 from AndyAyersMS/PropagateOptMethodFlags

Jit: fix issues with optMethodFlags

Author: AndyAyersMS

src/jit/compiler.cpp

@@ -1801,6 +1801,9 @@ void                Compiler::compInit(ArenaAllocator * pAlloc, InlineInfo * inl
     //Used by fgFindJumpTargets for inlining heuristics.
     opts.instrCount  = 0;
 
+    // Used to track when we should consider running EarlyProp
+    optMethodFlags = 0;
+
     for (unsigned i = 0; i < MAX_LOOP_NUM; i++)
     {
         AllVarSetOps::AssignNoCopy(this, optLoopTable[i].lpAsgVars, AllVarSetOps::UninitVal());

src/jit/compiler.h

@@ -5544,7 +5544,7 @@ protected :
     };
 
 #define OMF_HAS_NEWARRAY    0x00000001  // Method contains 'new' of an array
-#define OMF_HAS_NEWOBJ      0x00800002  // Method contains 'new' of an object type. 
+#define OMF_HAS_NEWOBJ      0x00000002  // Method contains 'new' of an object type.
 #define OMF_HAS_ARRAYREF    0x00000004  // Method contains array element loads or stores.
 #define OMF_HAS_VTABLEREF   0x00000008  // Method contains method table reference.
 
@@ -5561,8 +5561,6 @@ protected :
         OPK_OBJ_GETTYPE
     };
 
-    bool impHasArrayRef;
-
     bool       gtIsVtableRef(GenTreePtr tree);
     GenTreePtr getArrayLengthFromAllocation(GenTreePtr tree);
     GenTreePtr getObjectHandleNodeFromAllocation(GenTreePtr tree);
@@ -5573,7 +5571,6 @@ protected :
     bool       optDoEarlyPropForFunc();
     void       optEarlyProp();
 
-
 #if ASSERTION_PROP
     /**************************************************************************
      *               Value/Assertion propagation

src/jit/earlyprop.cpp

@@ -43,15 +43,14 @@ bool Compiler::gtIsVtableRef(GenTreePtr tree)
 {
     if (tree->OperGet() == GT_IND)
     {
-        GenTreeIndir* indir = tree->AsIndir();
+        GenTree* addr = tree->AsIndir()->Addr();
 
-        if (!indir->HasIndex())
+        if (addr->OperIsAddrMode())
         {
-            // Check if the base is an reference pointer.
-            if (indir->Base()->TypeGet() == TYP_REF)
-            {
-                return true;
-            }
+            GenTreeAddrMode* addrMode = addr->AsAddrMode();
+
+            return (!addrMode->HasIndex() &&
+                    (addrMode->Base()->TypeGet() == TYP_REF));
         }
     }
 

src/jit/flowgraph.cpp

@@ -22248,6 +22248,22 @@ void Compiler::fgInsertInlineeBlocks(InlineInfo* pInlineInfo)
     compNeedsGSSecurityCookie |= InlineeCompiler->compNeedsGSSecurityCookie;
     compGSReorderStackLayout  |= InlineeCompiler->compGSReorderStackLayout;
 
+    // Update optMethodFlags
+
+#ifdef DEBUG
+    unsigned optMethodFlagsBefore = optMethodFlags;
+#endif
+
+    optMethodFlags |= InlineeCompiler->optMethodFlags;
+
+#ifdef DEBUG
+    if (optMethodFlags != optMethodFlagsBefore)
+    {
+        JITDUMP("INLINER: Updating optMethodFlags --  root:%0x callee:%0x new:%0x\n",
+                optMethodFlagsBefore, InlineeCompiler->optMethodFlags, optMethodFlags);
+    }
+#endif
+
     // If there is non-NULL return, replace the GT_CALL with its return value expression,
     // so later it will be picked up by the GT_RET_EXPR node.
     if ((pInlineInfo->inlineCandidateInfo->fncRetType != TYP_VOID) || (iciCall->gtCall.gtReturnType == TYP_STRUCT))

src/jit/importer.cpp

@@ -10053,10 +10053,11 @@ void              Compiler::impImportBlockCode(BasicBlock * block)
 
             /* Mark the block as containing an index expression */
 
-            if  (op1->gtOper == GT_LCL_VAR)
+            if (op1->gtOper == GT_LCL_VAR)
             {
-                if  (op2->gtOper == GT_LCL_VAR ||
-                     op2->gtOper == GT_ADD)
+                if (op2->gtOper == GT_LCL_VAR ||
+                    op2->gtOper == GT_CNS_INT ||
+                    op2->gtOper == GT_ADD)
                 {
                     block->bbFlags |= BBF_HAS_INDX;
                     optMethodFlags |= OMF_HAS_ARRAYREF;
@@ -10281,10 +10282,11 @@ void              Compiler::impImportBlockCode(BasicBlock * block)
 
             // Mark the block as containing an index expression
 
-            if  (op3->gtOper == GT_LCL_VAR)
+            if (op3->gtOper == GT_LCL_VAR)
             {
-                if  (op1->gtOper == GT_LCL_VAR ||
-                     op1->gtOper == GT_ADD)
+                if (op1->gtOper == GT_LCL_VAR ||
+                    op1->gtOper == GT_CNS_INT ||
+                    op1->gtOper == GT_ADD)
                 {
                     block->bbFlags |= BBF_HAS_INDX;
                     optMethodFlags |= OMF_HAS_ARRAYREF;