Skip to content

Commit b26f770

Browse files
committed
[MERGE #5831 @pleath] Undo small change to make objtypespec more aggressive in the presence of object ptr copy prop
Merge pull request #5831 from pleath:deltablue We would like just to force a new type check if the new object header symbol causes us to look for a new type, but downstream objtypespecfldinfo may have slot indices based on the old type.
2 parents fb1c04f + 59e0dcf commit b26f770

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

lib/Backend/GlobOptFields.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,13 +1851,9 @@ GlobOpt::CopyPropPropertySymObj(IR::SymOpnd *symOpnd, IR::Instr *instr)
18511851
bool shouldOptimize = CompareCurrentTypesWithExpectedTypes(newValueInfo, propertySymOpnd);
18521852
if (!shouldOptimize)
18531853
{
1854-
// Force a new type check here. We used to disable optimization for this symbol, but that's
1855-
// no longer necessary now that inline caches are not shared.
1856-
BVSparse<JitArenaAllocator> *liveFields = this->currentBlock->globOptData.liveFields;
1857-
if (liveFields)
1858-
{
1859-
liveFields->Clear(newTypeSym->m_id);
1860-
}
1854+
// We would like just to force a new type check here and keep optimizing, but downstream
1855+
// objtypespecfldinfo may have slot indices based on the old type.
1856+
propertySymOpnd->SetTypeCheckSeqCandidate(false);
18611857
}
18621858
}
18631859

0 commit comments

Comments
 (0)