Merge pull request #25 from ntherning/bump-corert

Bump to latest upstream

1 files changed, 6 insertions, 2 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/MultiFileCompilationModuleGroup.cs b/src/ILCompiler.Compiler/src/Compiler/MultiFileCompilationModuleGroup.cs
index 9541e4285..842ddefad 100644
--- a/src/ILCompiler.Compiler/src/Compiler/MultiFileCompilationModuleGroup.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/MultiFileCompilationModuleGroup.cs
@@ -17,12 +17,11 @@ namespace ILCompiler
         private HashSet<ModuleDesc> _compilationModuleSet;
 
         public MultiFileCompilationModuleGroup(TypeSystemContext context, IEnumerable<ModuleDesc> compilationModuleSet)
-            : base(context)
         {
             _compilationModuleSet = new HashSet<ModuleDesc>(compilationModuleSet);
 
             // The fake assembly that holds compiler generated types is part of the compilation.
-            _compilationModuleSet.Add(this.GeneratedAssembly);
+            _compilationModuleSet.Add(context.GeneratedAssembly);
         }
 
         public sealed override bool ContainsType(TypeDesc type)
@@ -59,6 +58,11 @@ namespace ILCompiler
             return ContainsMethodBody(method, false);
         }
 
+        public sealed override bool ImportsMethod(MethodDesc method, bool unboxingStub)
+        {
+            return false;
+        }
+        
         public sealed override ExportForm GetExportTypeForm(TypeDesc type)
         {
             return ExportForm.None;