[MERGE chakra-core#857] PRE bookkeeping fix

pleath · pleath · commit 48295e33197a · 2016-04-26T17:29:22.000-07:00
Merge pull request chakra-core#857 from pleath:killallfields When we clear out live fields on discovering that implicit calls prevent loop optimization, we leave the same syms in the loop's initialValueFieldMap, resulting in later asserts. Two things: should use the KillAllFields API to clear out the live fields BV, and that API should walk the loop hierarchy setting the allFieldsKilled bits.
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -584,7 +584,7 @@ GlobOpt::OptBlock(BasicBlock *block)
         Assert(!TrackHoistableFields() || !HasHoistableFields(&this->blockData));
         if (!DoFieldCopyProp() && !DoFieldRefOpts())
         {
-            this->blockData.liveFields->ClearAll();
+            this->KillAllFields(blockData.liveFields);
         }
     }
 
diff --git a/lib/Backend/GlobOptFields.cpp b/lib/Backend/GlobOptFields.cpp
@@ -310,7 +310,10 @@ GlobOpt::KillLiveFields(StackSym * stackSym, BVSparse<JitArenaAllocator> * bv)
         bv->Clear(propertySym->m_id);
         if (this->IsLoopPrePass())
         {
-            this->rootLoopPrePass->fieldKilled->Set(propertySym->m_id);
+            for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)
+            {
+                loop->fieldKilled->Set(propertySym->m_id);
+            }
         }
         else if (bv->IsEmpty())
         {
@@ -339,7 +342,10 @@ void GlobOpt::KillLiveFields(BVSparse<JitArenaAllocator> *const propertyEquivSet
 
         if (this->IsLoopPrePass())
         {
-            this->rootLoopPrePass->fieldKilled->Or(propertyEquivSet);
+            for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)
+            {
+                loop->fieldKilled->Or(propertyEquivSet);
+            }
         }
     }
 }
@@ -382,7 +388,10 @@ GlobOpt::KillAllFields(BVSparse<JitArenaAllocator> * bv)
     bv->ClearAll();
     if (this->IsLoopPrePass())
     {
-        this->rootLoopPrePass->allFieldsKilled = true;
+        for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)
+        {
+            loop->allFieldsKilled = true;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ GlobOpt::OptBlock(BasicBlock *block)`
`584`	`584`	`Assert(!TrackHoistableFields() \|\| !HasHoistableFields(&this->blockData));`
`585`	`585`	`if (!DoFieldCopyProp() && !DoFieldRefOpts())`
`586`	`586`	`{`
`587`		`- this->blockData.liveFields->ClearAll();`
	`587`	`+ this->KillAllFields(blockData.liveFields);`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,10 @@ GlobOpt::KillLiveFields(StackSym * stackSym, BVSparse<JitArenaAllocator> * bv)`
`310`	`310`	`bv->Clear(propertySym->m_id);`
`311`	`311`	`if (this->IsLoopPrePass())`
`312`	`312`	`{`
`313`		`- this->rootLoopPrePass->fieldKilled->Set(propertySym->m_id);`
	`313`	`+ for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)`
	`314`	`+ {`
	`315`	`+ loop->fieldKilled->Set(propertySym->m_id);`
	`316`	`+ }`
`314`	`317`	`}`
`315`	`318`	`else if (bv->IsEmpty())`
`316`	`319`	`{`
`@@ -339,7 +342,10 @@ void GlobOpt::KillLiveFields(BVSparse<JitArenaAllocator> *const propertyEquivSet`
`339`	`342`
`340`	`343`	`if (this->IsLoopPrePass())`
`341`	`344`	`{`
`342`		`- this->rootLoopPrePass->fieldKilled->Or(propertyEquivSet);`
	`345`	`+ for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)`
	`346`	`+ {`
	`347`	`+ loop->fieldKilled->Or(propertyEquivSet);`
	`348`	`+ }`
`343`	`349`	`}`
`344`	`350`	`}`
`345`	`351`	`}`
`@@ -382,7 +388,10 @@ GlobOpt::KillAllFields(BVSparse<JitArenaAllocator> * bv)`
`382`	`388`	`bv->ClearAll();`
`383`	`389`	`if (this->IsLoopPrePass())`
`384`	`390`	`{`
`385`		`- this->rootLoopPrePass->allFieldsKilled = true;`
	`391`	`+ for (Loop * loop = this->rootLoopPrePass; loop != nullptr; loop = loop->parent)`
	`392`	`+ {`
	`393`	`+ loop->allFieldsKilled = true;`
	`394`	`+ }`
`386`	`395`	`}`
`387`	`396`	`}`
`388`	`397`