Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
30 changes: 27 additions & 3 deletions src/coreclr/jit/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -2232,8 +2232,8 @@ class FlowGraphNaturalLoop

bool HasDef(unsigned lclNum);

bool CanDuplicate(INDEBUG(const char** reason));
void Duplicate(BasicBlock** insertAfter, BlockToBlockMap* map, weight_t weightScale);
bool CanDuplicate(bool allowEH DEBUGARG(const char** reason));
void Duplicate(BasicBlock** insertAfter, BlockToBlockMap* map, weight_t weightScale, bool allowEH);

bool MayExecuteBlockMultipleTimesPerIteration(BasicBlock* block);

Expand Down Expand Up @@ -3001,7 +3001,7 @@ class Compiler

void fgRemoveEHTableEntry(unsigned XTnum);

EHblkDsc* fgAddEHTableEntry(unsigned XTnum);
EHblkDsc* fgTryAddEHTableEntries(unsigned XTnum, unsigned count = 1, bool deferAdding = false);

void fgSortEHTable();

Expand Down Expand Up @@ -5358,6 +5358,23 @@ class Compiler

PhaseStatus fgCloneFinally();

struct CloneTryInfo
{
CloneTryInfo(BitVecTraits& traits, BitVec& visited) : Traits(traits), Visited(visited) {}
BitVecTraits Traits;
BitVec& Visited;
BlockToBlockMap* Map = nullptr;
jitstd::vector<BasicBlock*>* BlocksToClone = nullptr;
weight_t ProfileScale = 0.0;
unsigned EHIndexShift = 0;
bool AddEdges = false;
bool ScaleOriginalBlockProfile = false;
};

bool fgCanCloneTryRegion(BasicBlock* tryEntry);

BasicBlock* fgCloneTryRegion(BasicBlock* tryEntry, CloneTryInfo& info, BasicBlock** insertAfter = nullptr);

void fgCleanupContinuation(BasicBlock* continuation);

PhaseStatus fgTailMergeThrows();
Expand Down Expand Up @@ -12260,6 +12277,13 @@ class EHClauses
assert((m_begin != nullptr) || (m_begin == m_end));
}

EHClauses(Compiler* comp, EHblkDsc* begin)
: m_begin(begin)
, m_end(comp->compHndBBtab + comp->compHndBBtabCount)
{
assert((m_begin != nullptr) || (m_begin == m_end));
}

iterator begin() const
{
return iterator(m_begin);
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/compmemkind.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ CompMemKindMacro(EarlyProp)
CompMemKindMacro(ZeroInit)
CompMemKindMacro(Pgo)
CompMemKindMacro(MaskConversionOpt)
CompMemKindMacro(TryRegionClone)
//clang-format on

#undef CompMemKindMacro
Loading
Loading