Skip to content
Permalink
Browse files

fix potentially bad merge from 1.11 to master

  • Loading branch information...
MikeHolman committed May 15, 2019
1 parent 1c75087 commit ea16256028b9433ba5b2f3153511e84ca8d756d6
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 ea16256

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