Skip to content
Permalink
Browse files

[MERGE #6123 @MikeHolman] fix potentially bad merge from 1.11 to master

Merge pull request #6123 from pr/MikeHolman/mergefix

There was extra condition for lazy bailout in master. When merging servicing update into unreleased/future, I noticed that the condition was handled different than how I merged it in master.
  • Loading branch information...
MikeHolman committed May 15, 2019
2 parents 1c75087 + ea16256 commit 49f594b3f49dcb66a3b126a4b65fb7ef57f1b01c
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/Backend/Lower.cpp
@@ -4865,11 +4865,11 @@ bool Lowerer::TryLowerNewScObjectWithFixedCtorCache(IR::Instr* newObjInstr, IR::

JITTimeConstructorCache * ctorCache;

if (newObjInstr->HasBailOutInfo() && !newObjInstr->HasLazyBailOut() && newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck)
if (newObjInstr->HasBailOutInfo() && newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck)
{
Assert(newObjInstr->IsNewScObjectInstr());
Assert(newObjInstr->IsProfiledInstr());
Assert(newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck || newObjInstr->HasLazyBailOut());
Assert(newObjInstr->GetBailOutKind() == IR::BailOutFailedCtorGuardCheck);

emitBailOut = true;

0 comments on commit 49f594b

Please sign in to comment.
You can’t perform that action at this time.