[MERGE chakra-core#1433 @Yongqu] MSFT 8152328 module initialization assert when one of the dependent was parsed earlier.

Yongqu · Yongqu · commit 344342c07c5a · 2016-08-12T14:36:58.000-07:00
Merge pull request chakra-core#1433 from Yongqu:bugfix Dependent module record notify the parent module that is is ready during DeclarationInitialization. We should count the number of unfinished dependent module as those that are not done with DeclarationInitialization not Parse. The test will be ported to core after we fix up ch test harness.
diff --git a/lib/Runtime/Language/SourceTextModuleRecord.cpp b/lib/Runtime/Language/SourceTextModuleRecord.cpp
@@ -39,7 +39,7 @@ namespace Js
         isRootModule(false),
         hadNotifyHostReady(false),
         localExportSlots(nullptr),
-        numUnParsedChildrenModule(0),
+        numUnInitializedChildrenModule(0),
         moduleId(InvalidModuleIndex),
         localSlotCount(InvalidSlotCount),
         localExportCount(0)
@@ -197,7 +197,7 @@ namespace Js
     {
         HRESULT hr = NO_ERROR;
 
-        if (numUnParsedChildrenModule == 0)
+        if (numUnInitializedChildrenModule == 0)
         {
             NotifyParentsAsNeeded();
         
@@ -239,11 +239,11 @@ namespace Js
         }
         else
         {
-            if (numUnParsedChildrenModule == 0)
+            if (numUnInitializedChildrenModule == 0)
             {
                 return NOERROR; // this is only in case of recursive module reference. Let the higher stack frame handle this module.
             }
-            numUnParsedChildrenModule--;
+            numUnInitializedChildrenModule--;
 
             hr = PrepareForModuleDeclarationInitialization();
         }
@@ -577,9 +577,9 @@ namespace Js
                         moduleRecord->parentModuleList = RecyclerNew(recycler, ModuleRecordList, recycler);
                     }
                     moduleRecord->parentModuleList->Add(this);
-                    if (!moduleRecord->WasParsed())
+                    if (!moduleRecord->WasDeclarationInitialized())
                     {
-                        numUnParsedChildrenModule++;
+                        numUnInitializedChildrenModule++;
                     }
                 }
                 return false;
diff --git a/lib/Runtime/Language/SourceTextModuleRecord.h b/lib/Runtime/Language/SourceTextModuleRecord.h
@@ -126,7 +126,7 @@ namespace Js
         LocalExportMap* localExportMapByExportName;  // from propertyId to index map: for bytecode gen.
         LocalExportMap* localExportMapByLocalName;  // from propertyId to index map: for bytecode gen.
         LocalExportIndexList* localExportIndexList; // from index to propertyId: for typehandler.
-        uint numUnParsedChildrenModule;
+        uint numUnInitializedChildrenModule;
         ExportedNames* exportedNames;
         ResolvedExportMap* resolvedExportMap;
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace Js`
`39`	`39`	`isRootModule(false),`
`40`	`40`	`hadNotifyHostReady(false),`
`41`	`41`	`localExportSlots(nullptr),`
`42`		`- numUnParsedChildrenModule(0),`
	`42`	`+ numUnInitializedChildrenModule(0),`
`43`	`43`	`moduleId(InvalidModuleIndex),`
`44`	`44`	`localSlotCount(InvalidSlotCount),`
`45`	`45`	`localExportCount(0)`
`@@ -197,7 +197,7 @@ namespace Js`
`197`	`197`	`{`
`198`	`198`	`HRESULT hr = NO_ERROR;`
`199`	`199`
`200`		`- if (numUnParsedChildrenModule == 0)`
	`200`	`+ if (numUnInitializedChildrenModule == 0)`
`201`	`201`	`{`
`202`	`202`	`NotifyParentsAsNeeded();`
`203`	`203`
`@@ -239,11 +239,11 @@ namespace Js`
`239`	`239`	`}`
`240`	`240`	`else`
`241`	`241`	`{`
`242`		`- if (numUnParsedChildrenModule == 0)`
	`242`	`+ if (numUnInitializedChildrenModule == 0)`
`243`	`243`	`{`
`244`	`244`	`return NOERROR; // this is only in case of recursive module reference. Let the higher stack frame handle this module.`
`245`	`245`	`}`
`246`		`- numUnParsedChildrenModule--;`
	`246`	`+ numUnInitializedChildrenModule--;`
`247`	`247`
`248`	`248`	`hr = PrepareForModuleDeclarationInitialization();`
`249`	`249`	`}`
`@@ -577,9 +577,9 @@ namespace Js`
`577`	`577`	`moduleRecord->parentModuleList = RecyclerNew(recycler, ModuleRecordList, recycler);`
`578`	`578`	`}`
`579`	`579`	`moduleRecord->parentModuleList->Add(this);`
`580`		`- if (!moduleRecord->WasParsed())`
	`580`	`+ if (!moduleRecord->WasDeclarationInitialized())`
`581`	`581`	`{`
`582`		`- numUnParsedChildrenModule++;`
	`582`	`+ numUnInitializedChildrenModule++;`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`	`return false;`