diff options
author | Kunal Pathak <Kunal.Pathak@microsoft.com> | 2021-02-25 21:52:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-25 21:52:45 +0300 |
commit | 3a24b921431832293d780ccd81c51edd4899241b (patch) | |
tree | d6289e729c7b221504383b8f5a692ac5d6002fbe /src/coreclr/jit/dataflow.h | |
parent | 9211db0a98286d12241ab7201c48884e3d6899a7 (diff) |
fix assertion merge for degenerate flow (#48607)
* fix assertion merge for degenerate flow
* fix the dupCount condition
* Add comment and jitdump
Diffstat (limited to 'src/coreclr/jit/dataflow.h')
-rw-r--r-- | src/coreclr/jit/dataflow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coreclr/jit/dataflow.h b/src/coreclr/jit/dataflow.h index 3f2ff1cc72a..7e84642dce6 100644 --- a/src/coreclr/jit/dataflow.h +++ b/src/coreclr/jit/dataflow.h @@ -16,7 +16,7 @@ // { // public: // void StartMerge(BasicBlock* block); -// void Merge(BasicBlock* block, BasicBlock* pred, flowList* preds); +// void Merge(BasicBlock* block, BasicBlock* pred, unsigned dupCount); // bool EndMerge(BasicBlock* block); // }; #pragma once @@ -61,7 +61,7 @@ void DataFlow::ForwardAnalysis(TCallback& callback) flowList* preds = m_pCompiler->BlockPredsWithEH(block); for (flowList* pred = preds; pred; pred = pred->flNext) { - callback.Merge(block, pred->getBlock(), preds); + callback.Merge(block, pred->getBlock(), pred->flDupCount); } } |