diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h index 7d79862592ffe0..57d279ac1ad00e 100644 --- a/src/coreclr/jit/compiler.h +++ b/src/coreclr/jit/compiler.h @@ -5310,7 +5310,6 @@ class Compiler fgWalkPostFn* wtpoVisitorFn; void* pCallbackData; // user-provided data GenTree* parent; // parent of current node, provided to callback - GenTreeStack* parentStack; // stack of parent nodes, if asked for bool wtprLclsOnly; // whether to only visit lclvar nodes #ifdef DEBUG bool printModified; // callback can use this @@ -10988,14 +10987,14 @@ class GenTreeVisitor } }; -template +template class GenericTreeWalker final - : public GenTreeVisitor> + : public GenTreeVisitor> { public: enum { - ComputeStack = computeStack, + ComputeStack = false, DoPreOrder = doPreOrder, DoPostOrder = doPostOrder, DoLclVarsOnly = doLclVarsOnly, @@ -11007,16 +11006,11 @@ class GenericTreeWalker final public: GenericTreeWalker(Compiler::fgWalkData* walkData) - : GenTreeVisitor>( + : GenTreeVisitor>( walkData->compiler) , m_walkData(walkData) { assert(walkData != nullptr); - - if (computeStack) - { - walkData->parentStack = &this->m_ancestors; - } } Compiler::fgWalkResult PreOrderVisit(GenTree** use, GenTree* user) diff --git a/src/coreclr/jit/compiler.hpp b/src/coreclr/jit/compiler.hpp index 21551a7fcce113..e610096100f253 100644 --- a/src/coreclr/jit/compiler.hpp +++ b/src/coreclr/jit/compiler.hpp @@ -2546,22 +2546,22 @@ inline Compiler::fgWalkResult Compiler::fgWalkTreePre( fgWalkResult result; if (lclVarsOnly && computeStack) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else if (lclVarsOnly) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else if (computeStack) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } @@ -2601,12 +2601,12 @@ inline Compiler::fgWalkResult Compiler::fgWalkTreePost(GenTree** pTree, fgWalkResult result; if (computeStack) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } @@ -2649,17 +2649,17 @@ inline Compiler::fgWalkResult Compiler::fgWalkTree(GenTree** pTree, if (preVisitor && postVisitor) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else if (preVisitor) { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); } else { - GenericTreeWalker walker(&walkData); + GenericTreeWalker walker(&walkData); result = walker.WalkTree(pTree, nullptr); }