diff options
author | Michelle McDaniel <adiaaida@gmail.com> | 2016-08-09 13:15:05 -0700 |
---|---|---|
committer | Michelle McDaniel <adiaaida@gmail.com> | 2016-08-11 09:53:41 -0700 |
commit | 36a2b906c008cd3693a9ab5aef7b4402addd6c74 (patch) | |
tree | 27333c6f26304490169825ae1c17484534246dc6 /src/jit/ssarenamestate.cpp | |
parent | ab7d6a8df73d3d89210a778338feaa9fedf4146a (diff) | |
download | coreclr-36a2b906c008cd3693a9ab5aef7b4402addd6c74.tar.gz coreclr-36a2b906c008cd3693a9ab5aef7b4402addd6c74.tar.bz2 coreclr-36a2b906c008cd3693a9ab5aef7b4402addd6c74.zip |
Reformat jit sources with clang-tidy and format
This change is the result of running clang-tidy and clang-format on jit
sources.
Diffstat (limited to 'src/jit/ssarenamestate.cpp')
-rw-r--r-- | src/jit/ssarenamestate.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/jit/ssarenamestate.cpp b/src/jit/ssarenamestate.cpp index 03bc8974a5..a1e05f192f 100644 --- a/src/jit/ssarenamestate.cpp +++ b/src/jit/ssarenamestate.cpp @@ -29,8 +29,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX * @params alloc The allocator class used to allocate jitstd data. */ SsaRenameState::SsaRenameState(const jitstd::allocator<int>& alloc, unsigned lvaCount) - : counts(NULL) - , stacks(NULL) + : counts(nullptr) + , stacks(nullptr) , definedLocs(alloc) , heapStack(alloc) , heapCount(0) @@ -46,7 +46,7 @@ SsaRenameState::SsaRenameState(const jitstd::allocator<int>& alloc, unsigned lva */ void SsaRenameState::EnsureCounts() { - if (counts == NULL) + if (counts == nullptr) { counts = jitstd::utility::allocate<unsigned>(m_alloc, lvaCount); for (unsigned i = 0; i < lvaCount; ++i) @@ -63,17 +63,16 @@ void SsaRenameState::EnsureCounts() */ void SsaRenameState::EnsureStacks() { - if (stacks == NULL) + if (stacks == nullptr) { stacks = jitstd::utility::allocate<Stack*>(m_alloc, lvaCount); for (unsigned i = 0; i < lvaCount; ++i) { - stacks[i] = NULL; + stacks[i] = nullptr; } } } - /** * Returns a SSA count number for a local variable and does a post increment. * @@ -109,9 +108,9 @@ unsigned SsaRenameState::CountForUse(unsigned lclNum) { EnsureStacks(); DBG_SSA_JITDUMP("[SsaRenameState::CountForUse] V%02u\n", lclNum); - + Stack* stack = stacks[lclNum]; - if (stack == NULL || stack->empty()) + if (stack == nullptr || stack->empty()) { return SsaConfig::UNINIT_SSA_NUM; } @@ -133,15 +132,15 @@ void SsaRenameState::Push(BasicBlock* bb, unsigned lclNum, unsigned count) // We'll use BB00 here to indicate the "block before any real blocks..." DBG_SSA_JITDUMP("[SsaRenameState::Push] BB%02u, V%02u, count = %d\n", bb != nullptr ? bb->bbNum : 0, lclNum, count); - + Stack* stack = stacks[lclNum]; - if (stack == NULL) + if (stack == nullptr) { DBG_SSA_JITDUMP("\tCreating a new stack\n"); stack = stacks[lclNum] = new (jitstd::utility::allocate<Stack>(m_alloc), jitstd::placement_t()) Stack(m_alloc); } - + if (stack->empty() || stack->back().m_bb != bb) { stack->push_back(SsaRenameStateForBlock(bb, count)); @@ -160,7 +159,7 @@ void SsaRenameState::Push(BasicBlock* bb, unsigned lclNum, unsigned count) printf("\tContents of the stack: ["); for (Stack::iterator iter2 = stack->begin(); iter2 != stack->end(); iter2++) { - printf("<BB%02u, %d>", ((*iter2).m_bb != nullptr ? (*iter2).m_bb->bbNum : 0) , (*iter2).m_count); + printf("<BB%02u, %d>", ((*iter2).m_bb != nullptr ? (*iter2).m_bb->bbNum : 0), (*iter2).m_count); } printf("]\n"); @@ -177,9 +176,9 @@ void SsaRenameState::PopBlockStacks(BasicBlock* block) while (!definedLocs.empty() && definedLocs.back().m_bb == block) { unsigned lclNum = definedLocs.back().m_lclNum; - assert(stacks != NULL); // Cannot be empty because definedLocs is not empty. + assert(stacks != nullptr); // Cannot be empty because definedLocs is not empty. Stack* stack = stacks[lclNum]; - assert(stack != NULL); + assert(stack != nullptr); assert(stack->back().m_bb == block); stack->pop_back(); definedLocs.pop_back(); @@ -189,7 +188,7 @@ void SsaRenameState::PopBlockStacks(BasicBlock* block) // the loop above popped them all. for (unsigned i = 0; i < lvaCount; ++i) { - if (stacks != NULL && stacks[i] != NULL && !stacks[i]->empty()) + if (stacks != nullptr && stacks[i] != nullptr && !stacks[i]->empty()) { assert(stacks[i]->back().m_bb != block); } @@ -209,7 +208,6 @@ void SsaRenameState::PopBlockHeapStack(BasicBlock* block) } } - #ifdef DEBUG /** * Print the stack data for each variable in a loop. @@ -228,7 +226,7 @@ void SsaRenameState::DumpStacks() { Stack* stack = stacks[i]; printf("V%02u:\t", i); - if (stack != NULL) + if (stack != nullptr) { for (Stack::iterator iter2 = stack->begin(); iter2 != stack->end(); ++iter2) { |