Skip to content

Move ReadyToRunSingleAssemblyCompilationModuleGroup out of multifile block #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trylek merged 1 commit into from
Jul 26, 2018
Merged

Move ReadyToRunSingleAssemblyCompilationModuleGroup out of multifile block #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/ILCompiler/src/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ private int Run(string[] args)
}
}

if (_multiFile || _isReadyToRunCodeGen)
if (_isReadyToRunCodeGen)
{
List<EcmaModule> inputModules = new List<EcmaModule>();

Expand All @@ -370,20 +370,30 @@ private int Run(string[] args)

if (entrypointModule == null)
{
// This is a multifile production build - we need to root all methods
compilationRoots.Add(new LibraryRootProvider(module));
}
inputModules.Add(module);
}

if (_isReadyToRunCodeGen)
{
compilationGroup = new ReadyToRunSingleAssemblyCompilationModuleGroup(typeSystemContext, inputModules);
}
else
compilationGroup = new ReadyToRunSingleAssemblyCompilationModuleGroup(typeSystemContext, inputModules);
}
else if (_multiFile)
{
List<EcmaModule> inputModules = new List<EcmaModule>();

foreach (var inputFile in typeSystemContext.InputFilePaths)
{
compilationGroup = new MultiFileSharedCompilationModuleGroup(typeSystemContext, inputModules);
EcmaModule module = typeSystemContext.GetModuleFromPath(inputFile.Value);

if (entrypointModule == null)
{
// This is a multifile production build - we need to root all methods
compilationRoots.Add(new LibraryRootProvider(module));
}
inputModules.Add(module);
}

compilationGroup = new MultiFileSharedCompilationModuleGroup(typeSystemContext, inputModules);
}
else
{
Expand Down