Field PRE for multi-level field loads involving LdSlot/LdSlotArr

rajatd · rajatd · commit 0c15d3898abd · 2018-05-12T11:59:51.000-07:00
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -3112,7 +3112,7 @@ GlobOpt::SetLoopFieldInitialValue(Loop *loop, IR::Instr *instr, PropertySym *pro
             }
             IR::Instr * defInstr = objectSym->GetInstrDef();
             IR::Opnd * src1 = defInstr->GetSrc1();
-            while (!(src1 && src1->IsSymOpnd() && src1->AsSymOpnd()->IsPropertySymOpnd()))
+            while (!(src1 && src1->IsSymOpnd() && src1->AsSymOpnd()->m_sym->IsPropertySym()))
             {
                 if (src1 && src1->IsRegOpnd() && src1->AsRegOpnd()->GetStackSym()->IsSingleDef())
                 {
@@ -17131,8 +17131,9 @@ GlobOpt::PRE::InsertSymDefinitionInLandingPad(StackSym * sym, Loop * loop, Sym *
     }
 
     IR::Opnd * symDefInstrSrc1 = symDefInstr->GetSrc1();
-    if (symDefInstrSrc1->IsSymOpnd() && symDefInstrSrc1->AsSymOpnd()->IsPropertySymOpnd())
+    if (symDefInstrSrc1->IsSymOpnd())
     {
+        Assert(symDefInstrSrc1->AsSymOpnd()->m_sym->IsPropertySym());
         // $L1
         //      T1 = o.x  (v1|T3)
         //      T2 = T1.y (v2|T4) <-- T1 is not live in the loop landing pad
@@ -17141,7 +17142,7 @@ GlobOpt::PRE::InsertSymDefinitionInLandingPad(StackSym * sym, Loop * loop, Sym *
         // Trying to make T1 live in the landing pad
 
         // o.x
-        PropertySym* propSym = symDefInstrSrc1->AsSymOpnd()->AsPropertySymOpnd()->GetPropertySym();
+        PropertySym* propSym = symDefInstrSrc1->AsSymOpnd()->m_sym->AsPropertySym();
 
         if (candidates->candidatesBv->Test(propSym->m_id))
         {
diff --git a/lib/Runtime/Library/JavascriptArray.inl b/lib/Runtime/Library/JavascriptArray.inl
@@ -974,12 +974,12 @@ SECOND_PASS:
                             LinkSegments((Js::SparseArraySegment<T>*)startPrev, current);
                             current->length = startOffset + length + growby;
                             current->CheckLengthvsSize();
-                        }
-                        if (current == head && HasNoMissingValues())
-                        {
-                            if (ScanForMissingValues<T>(startOffset + length, current->length))
+                            if (current == head && HasNoMissingValues())
                             {
-                                SetHasNoMissingValues(false);
+                                if (ScanForMissingValues<T>(startOffset + length, current->length))
+                                {
+                                    SetHasNoMissingValues(false);
+                                }
                             }
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -3112,7 +3112,7 @@ GlobOpt::SetLoopFieldInitialValue(Loop loop, IR::Instr instr, PropertySym *pro`
`3112`	`3112`	`}`
`3113`	`3113`	`IR::Instr * defInstr = objectSym->GetInstrDef();`
`3114`	`3114`	`IR::Opnd * src1 = defInstr->GetSrc1();`
`3115`		`- while (!(src1 && src1->IsSymOpnd() && src1->AsSymOpnd()->IsPropertySymOpnd()))`
	`3115`	`+ while (!(src1 && src1->IsSymOpnd() && src1->AsSymOpnd()->m_sym->IsPropertySym()))`
`3116`	`3116`	`{`
`3117`	`3117`	`if (src1 && src1->IsRegOpnd() && src1->AsRegOpnd()->GetStackSym()->IsSingleDef())`
`3118`	`3118`	`{`
`@@ -17131,8 +17131,9 @@ GlobOpt::PRE::InsertSymDefinitionInLandingPad(StackSym * sym, Loop * loop, Sym *`
`17131`	`17131`	`}`
`17132`	`17132`
`17133`	`17133`	`IR::Opnd * symDefInstrSrc1 = symDefInstr->GetSrc1();`
`17134`		`- if (symDefInstrSrc1->IsSymOpnd() && symDefInstrSrc1->AsSymOpnd()->IsPropertySymOpnd())`
	`17134`	`+ if (symDefInstrSrc1->IsSymOpnd())`
`17135`	`17135`	`{`
	`17136`	`+ Assert(symDefInstrSrc1->AsSymOpnd()->m_sym->IsPropertySym());`
`17136`	`17137`	`// $L1`
`17137`	`17138`	`// T1 = o.x (v1\|T3)`
`17138`	`17139`	`// T2 = T1.y (v2\|T4) <-- T1 is not live in the loop landing pad`
`@@ -17141,7 +17142,7 @@ GlobOpt::PRE::InsertSymDefinitionInLandingPad(StackSym * sym, Loop * loop, Sym *`
`17141`	`17142`	`// Trying to make T1 live in the landing pad`
`17142`	`17143`
`17143`	`17144`	`// o.x`
`17144`		`- PropertySym* propSym = symDefInstrSrc1->AsSymOpnd()->AsPropertySymOpnd()->GetPropertySym();`
	`17145`	`+ PropertySym* propSym = symDefInstrSrc1->AsSymOpnd()->m_sym->AsPropertySym();`
`17145`	`17146`
`17146`	`17147`	`if (candidates->candidatesBv->Test(propSym->m_id))`
`17147`	`17148`	`{`
Original file line number	Diff line number	Diff line change
`@@ -974,12 +974,12 @@ SECOND_PASS:`
`974`	`974`	`LinkSegments((Js::SparseArraySegment<T>*)startPrev, current);`
`975`	`975`	`current->length = startOffset + length + growby;`
`976`	`976`	`current->CheckLengthvsSize();`
`977`		`- }`
`978`		`- if (current == head && HasNoMissingValues())`
`979`		`- {`
`980`		`- if (ScanForMissingValues<T>(startOffset + length, current->length))`
	`977`	`+ if (current == head && HasNoMissingValues())`
`981`	`978`	`{`
`982`		`- SetHasNoMissingValues(false);`
	`979`	`+ if (ScanForMissingValues<T>(startOffset + length, current->length))`
	`980`	`+ {`
	`981`	`+ SetHasNoMissingValues(false);`
	`982`	`+ }`
`983`	`983`	`}`
`984`	`984`	`}`
`985`	`985`	`}`