Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 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
25 changes: 24 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line number Diff line number Diff line change
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,22 @@ class Compiler

PhaseStatus fgCloneFinally();

struct CloneTryInfo
{
CloneTryInfo(BitVecTraits& traits, BitVec& visited) : m_traits(traits), m_visited(visited) {}
BitVecTraits m_traits;
BitVec& m_visited;
BlockToBlockMap* m_map = nullptr;
jitstd::vector<BasicBlock*>* m_blocksToClone = nullptr;
bool m_addEdges = false;
weight_t m_profileScale = 0.0;
unsigned m_ehRegionShift = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The m_ prefix looks a bit odd to me for public fields meant to be accessed externally.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, changed to be initial caps.

};

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 +12276,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