Merge pull request #1439 from BrzVlad/feature-managed-allocator

[mono.git] / mcs / mcs / driver.cs

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index 352974855a45e981caedb7e13aca99b45ab9c797..9f55f368256aae961d4d26d2154aa6a9807b8143 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -57,7 +57,7 @@ namespace Mono.CSharp
                                SeekableStreamReader reader = new SeekableStreamReader (input, ctx.Settings.Encoding);
                                var file = new CompilationSourceFile (module, sourceFile);
 
-                               Tokenizer lexer = new Tokenizer (reader, file, session);
+                               Tokenizer lexer = new Tokenizer (reader, file, session, ctx.Report);
                                int token, tokens = 0, errors = 0;
 
                                while ((token = lexer.token ()) != Token.EOF){
@@ -78,9 +78,9 @@ namespace Mono.CSharp
 
                        Location.Initialize (sources);
 
-                       var session = new ParserSession () {
+                       var session = new ParserSession {
                                UseJayGlobalArrays = true,
-                               LocatedTokens = new Tokenizer.LocatedToken[15000]
+                               LocatedTokens = new LocatedToken[15000]
                        };
 
                        for (int i = 0; i < sources.Count; ++i) {
@@ -328,6 +328,7 @@ namespace Mono.CSharp
                        tr.Start (TimeReporter.TimerType.CreateTypeTotal);
                        module.CreateContainer ();
                        importer.AddCompiledAssembly (assembly);
+                       references_loader.CompiledAssembly = assembly;
                        tr.Stop (TimeReporter.TimerType.CreateTypeTotal);
 
                        references_loader.LoadReferences (module);