[[ ModuleAssemblies ]] Don't include support modules in manifest requirements

livecodeali · livecodeali · commit c93a529b7099 · 2018-01-11T11:00:45.000Z
Support modules in a multi-module assembly should not be included in the list
of required modules in manifest, as they are compiled into the one bytecode
file and thus are not strictly dependencies from an external point of view.
diff --git a/toolchain/lc-compile/src/emit.cpp b/toolchain/lc-compile/src/emit.cpp
@@ -171,6 +171,7 @@ extern "C" void EmitPosition(PositionRef position);
 extern "C" void OutputBeginManifest(void);
 
 extern "C" int IsBootstrapCompile(void);
+extern "C" int IsNotBytecodeOutput(void);
 
 extern "C" void DependStart(void);
 extern "C" void DependFinish(void);
diff --git a/toolchain/lc-compile/src/generate.g b/toolchain/lc-compile/src/generate.g
@@ -28,13 +28,17 @@
 
 'var' ModuleDependencyList : NAMELIST
 
+-- Keep a list of all modules for which bytecode is being generated
+'var' CompiledModuleList : NAMELIST
+
 'var' IgnoredModuleList : NAMELIST
 
 'var' GeneratingModuleIndex : INT
 
 'action' GenerateModules(MODULELIST)
 
     'rule' GenerateModules(List):
+        CompiledModuleList <- nil
         GeneratingModuleIndex <- 1
         EmitStart()
         GenerateForEachModule(List)
@@ -54,6 +58,7 @@
 'action' Generate(MODULE)
 
     'rule' Generate(Module):
+        CompiledModuleList <- nil
         GeneratingModuleIndex <- 1
         EmitStart()
         GenerateSingleModule(Module)
@@ -80,6 +85,9 @@
             where(Kind -> library)
             EmitBeginLibraryModule(ModuleName -> ModuleIndex)
         |)
+
+        AddModuleToCompiledList(ModuleName)
+
         Info'Index <- ModuleIndex
         GeneratingModuleIndex -> Generator
         Info'Generator <- Generator
@@ -185,13 +193,34 @@
 
 'action' AddModuleToDependencyList(NAME)
 
+    'rule' AddModuleToDependencyList(Name):
+        -- If this is in the list of compiled modules, then don't
+        -- include in list of required modules in manifest - in
+        -- particular if we are creating a multi-module assembly,
+        -- then this is not an external dependency.
+        CompiledModuleList -> NoDependencyList
+        IsNameInList(Name, NoDependencyList)
+
     'rule' AddModuleToDependencyList(Name):
         ModuleDependencyList -> List
         IsNameInList(Name, List)
         
     'rule' AddModuleToDependencyList(Name):
         ModuleDependencyList -> List
         ModuleDependencyList <- namelist(Name, List)
+
+'action' AddModuleToCompiledList(NAME)
+
+    'rule' AddModuleToCompiledList(Name):
+        IsNotBytecodeOutput()
+
+    'rule' AddModuleToCompiledList(Name):
+        CompiledModuleList -> List
+        IsNameInList(Name, List)
+
+    'rule' AddModuleToCompiledList(Name):
+        CompiledModuleList -> List
+        CompiledModuleList <- namelist(Name, List)
         
 'action' GenerateManifestRequires(NAMELIST)
 
diff --git a/toolchain/lc-compile/src/main.c b/toolchain/lc-compile/src/main.c
@@ -39,6 +39,11 @@ int IsBootstrapCompile(void)
     return s_is_bootstrap;
 }
 
+int IsNotBytecodeOutput(void)
+{
+    return OutputFileAsBytecode == 0;
+}
+
 int IsDependencyCompile(void)
 {
     return DependencyMode != kDependencyModeNone;
diff --git a/toolchain/lc-compile/src/support.g b/toolchain/lc-compile/src/support.g
@@ -21,6 +21,7 @@
 
 'export'
     IsBootstrapCompile
+    IsNotBytecodeOutput
 
     NegateReal
 
@@ -366,6 +367,7 @@
 --------------------------------------------------------------------------------
 
 'condition' IsBootstrapCompile()
+'condition' IsNotBytecodeOutput()
 
 --------------------------------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@ int IsBootstrapCompile(void)`
`39`	`39`	`return s_is_bootstrap;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+int IsNotBytecodeOutput(void)`
	`43`	`+{`
	`44`	`+ return OutputFileAsBytecode == 0;`
	`45`	`+}`
	`46`	`+`
`42`	`47`	`int IsDependencyCompile(void)`
`43`	`48`	`{`
`44`	`49`	`return DependencyMode != kDependencyModeNone;`