Merge pull request #6300 from sejongoh/decompose_gt_ind

Decompose GT_IND for x86

Author: sejongoh

src/jit/decomposelongs.cpp

@@ -211,7 +211,7 @@ void DecomposeLongs::DecomposeNode(GenTree** ppTree, Compiler::fgWalkData* data)
         break;
 
     case GT_IND:
-        NYI("GT_IND of TYP_LONG");
+        DecomposeInd(ppTree, data);
         break;
 
     case GT_NOT:
@@ -865,6 +865,39 @@ void DecomposeLongs::DecomposeStoreInd(GenTree** ppTree, Compiler::fgWalkData* d
 }
 
 
+//------------------------------------------------------------------------
+// DecomposeInd: Decompose GT_IND.
+//
+// Arguments:
+//    tree - the tree to decompose
+//
+// Return Value:
+//    None.
+//
+void DecomposeLongs::DecomposeInd(GenTree** ppTree, Compiler::fgWalkData* data)
+{
+    GenTreePtr indLow = *ppTree;
+    GenTreeStmt* addrStmt = CreateTemporary(&indLow->gtOp.gtOp1);
+    JITDUMP("[DecomposeInd]: Saving addr tree to a temp var:\n");
+    DISPTREE(addrStmt);
+
+    // Change the type of lower ind.
+    indLow->gtType = TYP_INT;
+
+    // Create tree of ind(addr+4)
+    GenTreePtr addrBase = indLow->gtGetOp1();
+    GenTreePtr addrBaseHigh = new(m_compiler, GT_LCL_VAR) GenTreeLclVar(GT_LCL_VAR,
+        addrBase->TypeGet(), addrBase->AsLclVarCommon()->GetLclNum(), BAD_IL_OFFSET);
+    GenTreePtr addrHigh = new(m_compiler, GT_LEA) GenTreeAddrMode(TYP_REF, addrBaseHigh, nullptr, 0, genTypeSize(TYP_INT));
+    GenTreePtr indHigh = new (m_compiler, GT_IND) GenTreeIndir(GT_IND, TYP_INT, addrHigh, nullptr);
+    
+    // Connect linear links
+    SimpleLinkNodeAfter(addrBaseHigh, addrHigh);
+    SimpleLinkNodeAfter(addrHigh, indHigh);
+
+    FinalizeDecomposition(ppTree, data, indLow, indHigh);
+}
+
 //------------------------------------------------------------------------
 // DecomposeNot: Decompose GT_NOT.
 //

src/jit/decomposelongs.h

@@ -42,6 +42,7 @@ class DecomposeLongs
     void DecomposeCast(GenTree** ppTree, Compiler::fgWalkData* data);
     void DecomposeCnsLng(GenTree** ppTree, Compiler::fgWalkData* data);
     void DecomposeCall(GenTree** ppTree, Compiler::fgWalkData* data);
+    void DecomposeInd(GenTree** ppTree, Compiler::fgWalkData* data);
     void DecomposeStoreInd(GenTree** ppTree, Compiler::fgWalkData* data);
     void DecomposeNot(GenTree** ppTree, Compiler::fgWalkData* data);
     void DecomposeNeg(GenTree** ppTree, Compiler::fgWalkData* data);