diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2017-01-19 16:35:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 16:35:07 -0800 |
| commit | 3243366c41c0f80deddc72101c50932954e7a001 (patch) | |
| tree | aa73e19681e63e4f97ebba3762320e442a24ccfd | |
| parent | a58a4fd513a584cb6f92f0504a142327de6390e8 (diff) | |
| parent | 5d0305399e59d81dc210f2ebe56fc9d314ff2bd0 (diff) | |
| download | coreclr-3243366c41c0f80deddc72101c50932954e7a001.tar.gz coreclr-3243366c41c0f80deddc72101c50932954e7a001.tar.bz2 coreclr-3243366c41c0f80deddc72101c50932954e7a001.zip | |
Merge pull request #9013 from jashook/arm32_build_fix
Fix arm32 build break
| -rw-r--r-- | src/jit/flowgraph.cpp | 1 | ||||
| -rw-r--r-- | src/jit/morph.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp index f48daaa511..5deecbadba 100644 --- a/src/jit/flowgraph.cpp +++ b/src/jit/flowgraph.cpp @@ -11658,6 +11658,7 @@ DONE: void Compiler::fgClearFinallyTargetBit(BasicBlock* block) { + assert(fgComputePredsDone); assert((block->bbFlags & BBF_FINALLY_TARGET) != 0); for (flowList* pred = block->bbPreds; pred; pred = pred->flNext) diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp index 0947f1c28f..67cf985a82 100644 --- a/src/jit/morph.cpp +++ b/src/jit/morph.cpp @@ -16910,6 +16910,8 @@ void Compiler::fgMorph() fgDebugCheckBBlist(false, false); #endif // DEBUG +// RemoveEmptyFinally is disabled on ARM due to github issue #9013 +#ifndef _TARGET_ARM_ fgRemoveEmptyFinally(); EndPhase(PHASE_EMPTY_FINALLY); @@ -16917,6 +16919,7 @@ void Compiler::fgMorph() fgCloneFinally(); EndPhase(PHASE_CLONE_FINALLY); +#endif // _TARGET_ARM_ /* For x64 and ARM64 we need to mark irregular parameters early so that they don't get promoted */ fgMarkImplicitByRefArgs(); |