From c566eb7e15727df99b4a24ae2df3a65a956e5b85 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Mon, 6 Feb 2017 17:19:24 -0800 Subject: [PATCH] Remove unnecessary parameter to genCallFinally() Commit migrated from https://github.com/dotnet/coreclr/commit/b79855eb3353b94308abcd595fbdbb1421e86f61 --- src/coreclr/src/jit/codegenarm.cpp | 2 +- src/coreclr/src/jit/codegenarm64.cpp | 4 +--- src/coreclr/src/jit/codegenlinear.cpp | 7 +++---- src/coreclr/src/jit/codegenlinear.h | 2 +- src/coreclr/src/jit/codegenxarch.cpp | 4 +--- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/coreclr/src/jit/codegenarm.cpp b/src/coreclr/src/jit/codegenarm.cpp index 9229847..81f5889 100644 --- a/src/coreclr/src/jit/codegenarm.cpp +++ b/src/coreclr/src/jit/codegenarm.cpp @@ -50,7 +50,7 @@ void CodeGen::genEmitGSCookieCheck(bool pushReg) //------------------------------------------------------------------------ // genCallFinally: Generate a call to the finally block. // -BasicBlock* CodeGen::genCallFinally(BasicBlock* block, BasicBlock* lblk) +BasicBlock* CodeGen::genCallFinally(BasicBlock* block) { NYI("ARM genCallFinally"); return block; diff --git a/src/coreclr/src/jit/codegenarm64.cpp b/src/coreclr/src/jit/codegenarm64.cpp index 585038b..71c6dd1 100644 --- a/src/coreclr/src/jit/codegenarm64.cpp +++ b/src/coreclr/src/jit/codegenarm64.cpp @@ -1326,7 +1326,7 @@ void CodeGen::genEmitGSCookieCheck(bool pushReg) genDefineTempLabel(gsCheckBlk); } -BasicBlock* CodeGen::genCallFinally(BasicBlock* block, BasicBlock* lblk) +BasicBlock* CodeGen::genCallFinally(BasicBlock* block) { // Generate a call to the finally, like this: // mov x0,qword ptr [fp + 10H] / sp // Load x0 with PSPSym, or sp if PSPSym is not used @@ -1387,8 +1387,6 @@ BasicBlock* CodeGen::genCallFinally(BasicBlock* block, BasicBlock* lblk) if (!(block->bbFlags & BBF_RETLESS_CALL)) { assert(block->isBBCallAlwaysPair()); - - lblk = block; block = block->bbNext; } return block; diff --git a/src/coreclr/src/jit/codegenlinear.cpp b/src/coreclr/src/jit/codegenlinear.cpp index 6829d96..329c4a7 100644 --- a/src/coreclr/src/jit/codegenlinear.cpp +++ b/src/coreclr/src/jit/codegenlinear.cpp @@ -133,9 +133,8 @@ void CodeGen::genCodeForBBlist() */ BasicBlock* block; - BasicBlock* lblk; /* previous block */ - for (lblk = nullptr, block = compiler->fgFirstBB; block != nullptr; lblk = block, block = block->bbNext) + for (block = compiler->fgFirstBB; block != nullptr; block = block->bbNext) { #ifdef DEBUG if (compiler->verbose) @@ -284,7 +283,7 @@ void CodeGen::genCodeForBBlist() } #endif // We should never have a block that falls through into the Cold section - noway_assert(!lblk->bbFallsThrough()); + noway_assert(!block->bbPrev->bbFallsThrough()); // We require the block that starts the Cold section to have a label noway_assert(block->bbEmitCookie); @@ -602,7 +601,7 @@ void CodeGen::genCodeForBBlist() break; case BBJ_CALLFINALLY: - block = genCallFinally(block, lblk); + block = genCallFinally(block); break; #if FEATURE_EH_FUNCLETS diff --git a/src/coreclr/src/jit/codegenlinear.h b/src/coreclr/src/jit/codegenlinear.h index ab82f7b..c8a5af6 100644 --- a/src/coreclr/src/jit/codegenlinear.h +++ b/src/coreclr/src/jit/codegenlinear.h @@ -218,7 +218,7 @@ void genCallInstruction(GenTreePtr call); void genJmpMethod(GenTreePtr jmp); -BasicBlock* genCallFinally(BasicBlock* block, BasicBlock* lblk); +BasicBlock* genCallFinally(BasicBlock* block); #if FEATURE_EH_FUNCLETS void genEHCatchRet(BasicBlock* block); diff --git a/src/coreclr/src/jit/codegenxarch.cpp b/src/coreclr/src/jit/codegenxarch.cpp index 7367dbb..decaec3 100644 --- a/src/coreclr/src/jit/codegenxarch.cpp +++ b/src/coreclr/src/jit/codegenxarch.cpp @@ -226,7 +226,7 @@ void CodeGen::genEmitGSCookieCheck(bool pushReg) genPopRegs(pushedRegs, byrefPushedRegs, norefPushedRegs); } -BasicBlock* CodeGen::genCallFinally(BasicBlock* block, BasicBlock* lblk) +BasicBlock* CodeGen::genCallFinally(BasicBlock* block) { #if FEATURE_EH_FUNCLETS // Generate a call to the finally, like this: @@ -354,8 +354,6 @@ BasicBlock* CodeGen::genCallFinally(BasicBlock* block, BasicBlock* lblk) if (!(block->bbFlags & BBF_RETLESS_CALL)) { assert(block->isBBCallAlwaysPair()); - - lblk = block; block = block->bbNext; } return block; -- 2.7.4