diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2015-11-17 16:11:18 -0800 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2015-11-17 16:11:18 -0800 |
| commit | a0f20fa5e578cfe56f2305d95325157fa97d328c (patch) | |
| tree | 5de5a8bd48943e597407f0ea98abd85418c1c93a /src | |
| parent | f295a36eb12ddd93ec61c196c65c384f0d2e3870 (diff) | |
| parent | c1bf3a266cf1c588adc5e96b2524e67bae930937 (diff) | |
| download | coreclr-a0f20fa5e578cfe56f2305d95325157fa97d328c.tar.gz coreclr-a0f20fa5e578cfe56f2305d95325157fa97d328c.tar.bz2 coreclr-a0f20fa5e578cfe56f2305d95325157fa97d328c.zip | |
Merge pull request #2082 from BruceForstall/Fix2053
Fix RyuJIT assert 'emitCurIG != emitPrologIG'
Diffstat (limited to 'src')
| -rw-r--r-- | src/jit/emit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jit/emit.cpp b/src/jit/emit.cpp index fa9d3597de..e327657af5 100644 --- a/src/jit/emit.cpp +++ b/src/jit/emit.cpp @@ -1498,6 +1498,7 @@ void emitter::emitBegProlog() #endif emitNoGCIG = true; + emitForceNewIG = false; /* Switch to the pre-allocated prolog IG */ @@ -1909,6 +1910,7 @@ void emitter::emitBegPrologEpilog(insGroup* igPh) igPh->igFlags &= ~IGF_PLACEHOLDER; emitNoGCIG = true; + emitForceNewIG = false; /* Set up the GC info that we stored in the placeholder */ @@ -3216,7 +3218,7 @@ void emitter::emitDispIG(insGroup* ig, insGroup* igPrev, bool ver printf("IG%02u ", igPh->igPhData->igPhNext->igNum); else printf("<END>"); - printf(", BB=%08XH", dspPtr(igPh->igPhData->igPhBB)); + printf(", BB=%08XH (BB%02u)", dspPtr(igPh->igPhData->igPhBB), (igPh->igPhData->igPhBB != nullptr) ? igPh->igPhData->igPhBB->bbNum : 0 ); emitDispIGflags(igPh->igFlags); |