Skip to content

Commit ea16256

Browse files
committed
fix potentially bad merge from 1.11 to master
1 parent 1c75087 commit ea16256

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Backend/Lower.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4865,11 +4865,11 @@ bool Lowerer::TryLowerNewScObjectWithFixedCtorCache(IR::Instr* newObjInstr, IR::
48654865

48664866
JITTimeConstructorCache * ctorCache;
48674867

4868-
if (newObjInstr->HasBailOutInfo() && !newObjInstr->HasLazyBailOut() && newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck)
4868+
if (newObjInstr->HasBailOutInfo() && newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck)
48694869
{
48704870
Assert(newObjInstr->IsNewScObjectInstr());
48714871
Assert(newObjInstr->IsProfiledInstr());
4872-
Assert(newObjInstr->GetBailOutKindNoBits() == IR::BailOutFailedCtorGuardCheck || newObjInstr->HasLazyBailOut());
4872+
Assert(newObjInstr->GetBailOutKind() == IR::BailOutFailedCtorGuardCheck);
48734873

48744874
emitBailOut = true;
48754875

0 commit comments

Comments
 (0)