Merge pull request #30 from pgavlin/LIRDumpUpdates

Update LIR dumps.
BruceForstall · Aug 12, 2016 · 23dfb61 · 23dfb61
2 parents e7c842b + b4d6593
commit 23dfb61
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 407 deletions.
diff --git a/src/jit/compiler.h b/src/jit/compiler.h
@@ -2115,13 +2115,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
                                              IndentStack*           indentStack);
     void                    gtDispFieldSeq  (FieldSeqNode*          pfsn);
 
-    GenTreePtr              gtDispLinearTree(GenTreeStmt*           curStmt,
-                                             GenTreePtr             nextLinearNode,
-                                             GenTreePtr             tree,
-                                             IndentStack*           indentStack,
-                                             __in_opt const char*   msg = nullptr);
-    GenTreePtr              gtDispLinearStmt(GenTreeStmt*           stmt,
-                                             IndentStack*           indentStack = nullptr);
+    void                    gtDispRange     (LIR::ReadOnlyRange const & range);
+
+    void                    gtDispTreeRange (LIR::Range& containingRange, GenTree* tree);
 
     void                    gtDispLIRNode   (GenTree*               node);
 #endif

diff --git a/src/jit/decomposelongs.cpp b/src/jit/decomposelongs.cpp
@@ -629,22 +629,22 @@ GenTree* DecomposeLongs::DecomposeStoreInd(LIR::Use& use)
     LIR::Use address(BlockRange(), &tree->gtOp.gtOp1, tree);
     address.ReplaceWithLclVar(m_compiler, blockWeight);
     JITDUMP("[DecomposeStoreInd]: Saving address tree to a temp var:\n");
-    DISPTREE(address.Def());
+    DISPTREERANGE(BlockRange(), address.Def());
 
     if (!gtLong->gtOp.gtOp1->OperIsLeaf())
     {
         LIR::Use op1(BlockRange(), &gtLong->gtOp.gtOp1, gtLong);
         op1.ReplaceWithLclVar(m_compiler, blockWeight);
         JITDUMP("[DecomposeStoreInd]: Saving low data tree to a temp var:\n");
-        DISPTREE(op1.Def());
+        DISPTREERANGE(BlockRange(), op1.Def());
     }
 
     if (!gtLong->gtOp.gtOp2->OperIsLeaf())
     {
         LIR::Use op2(BlockRange(), &gtLong->gtOp.gtOp2, gtLong);
         op2.ReplaceWithLclVar(m_compiler, blockWeight);
         JITDUMP("[DecomposeStoreInd]: Saving high data tree to a temp var:\n");
-        DISPTREE(op2.Def());
+        DISPTREERANGE(BlockRange(), op2.Def());
     }
 
     // Example trees after embedded statements for address and data are added.
@@ -788,7 +788,7 @@ GenTree* DecomposeLongs::DecomposeInd(LIR::Use& use)
     LIR::Use address(BlockRange(), &indLow->gtOp.gtOp1, indLow);
     address.ReplaceWithLclVar(m_compiler, m_block->getBBWeight(m_compiler));
     JITDUMP("[DecomposeInd]: Saving addr tree to a temp var:\n");
-    DISPTREE(address.Def());
+    DISPTREERANGE(BlockRange(), address.Def());
 
     // Change the type of lower ind.
     indLow->gtType = TYP_INT;

diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp
@@ -19532,10 +19532,7 @@ void                Compiler::fgDumpBlock(BasicBlock* block)
     }
     else
     {
-        for (GenTree* node = block->bbTreeList; node != nullptr; node = node->gtNext)
-        {
-            gtDispLIRNode(node);
-        }
+        gtDispRange(LIR::AsRange(block));
     }
 }