Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix basicBlockContinuation after else #1190

Merged
merged 3 commits into from
Oct 5, 2024
Merged

fix basicBlockContinuation after else #1190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41292ae
fix basicBlockContinuation after else
Hecate2 Oct 2, 2024
9eba16f
test basic block nextBlock in if return
Hecate2 Oct 2, 2024
9984eed
Merge branch 'master' into fix-basic-block-after-else
Jim8y Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Neo.Compiler.CSharp/Optimizer/Analysers/BasicBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Neo.SmartContract.Manifest;
using Neo.VM;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;

namespace Neo.Optimizer
Expand All @@ -24,6 +25,7 @@ namespace Neo.Optimizer
/// The end of a basic block can be a jumping instruction, an ENDFINALLY, a RET, etc.
/// Instructions in the same basic block can be replaced with more effcient ones.
/// </summary>
[DebuggerDisplay("BasicBlock addr={startAddr}")]
public class BasicBlock
{
public readonly int startAddr;
Expand Down
8 changes: 4 additions & 4 deletions src/Neo.Compiler.CSharp/Optimizer/Analysers/InstructionCoverage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ public BranchType CoverInstruction(int addr, Stack<TryStack>? stack = null,
// Here we have the exception not catched
if (!coveredMap.TryGetValue(addr, out BranchType value))
throw new BadScriptException($"wrong address {addr}");
Instruction instruction = script.GetInstruction(addr);
if (jumpTargetToSources.ContainsKey(instruction) && addr != entranceAddr)
// on target of jump, start a new recursion to split basic blocks
return coveredMap[firstNotNopAddr] = CoverInstruction(addr, stack, continueFromBasicBlockEntranceAddr: firstNotNopAddr);
if (value != BranchType.UNCOVERED)
{
if (stackType != TryStackType.FINALLY)
Expand All @@ -243,10 +247,6 @@ public BranchType CoverInstruction(int addr, Stack<TryStack>? stack = null,
// FINALLY is OK, but throwed in previous TRY (without catch) or CATCH
return BranchType.THROW; // Do not set coveredMap[entranceAddr] = BranchType.THROW;
}
Instruction instruction = script.GetInstruction(addr);
if (jumpTargetToSources.ContainsKey(instruction) && addr != entranceAddr)
// on target of jump, start a new recursion to split basic blocks
return coveredMap[firstNotNopAddr] = CoverInstruction(addr, stack, continueFromBasicBlockEntranceAddr: addr);
if (instruction.OpCode != OpCode.NOP)
{
coveredMap[addr] = BranchType.OK;
Expand Down
Loading