Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
15 changes: 5 additions & 10 deletions src/coreclr/interpreter/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2258,16 +2258,6 @@ void InterpCompiler::InitializeClauseBuildingBlocks(CORINFO_METHOD_INFO* methodI
BADCODE("Invalid handler region in EH clause");
}

// Find and mark all basic blocks that are part of the try region.
for (uint32_t j = clause.TryOffset; j < (clause.TryOffset + clause.TryLength); j++)
{
InterpBasicBlock* pBB = m_ppOffsetToBB[j];
if (pBB != NULL && pBB->clauseType == BBClauseNone)
{
pBB->clauseType = BBClauseTry;
}
}

InterpBasicBlock* pHandlerBB = GetBB(clause.HandlerOffset);

// Find and mark all basic blocks that are part of the handler region.
Expand Down Expand Up @@ -7474,6 +7464,11 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
}
case CEE_LOCALLOC:
CHECK_STACK(1);
if (m_pCBB->clauseType != BBClauseNone)
{
// Localloc inside a funclet is not allowed
BADCODE("CEE_LOCALLOC inside funclet");
}
#if TARGET_64BIT
// Length is natural unsigned int
if (m_pStackPointer[-1].type == StackTypeI4)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/interpreter/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ enum InterpBBState
enum InterpBBClauseType
{
BBClauseNone,
BBClauseTry,
BBClauseCatch,
BBClauseFinally,
BBClauseFilter,
Expand Down
Loading