Repoting platform declarations clashes in CLI compiler for JVM

#KT-1 In Progress
This commit is contained in:
Andrey Breslav
2014-05-25 12:42:00 +02:00
parent f4f1dd8f8b
commit 449723e388
6 changed files with 30 additions and 1 deletions
@@ -328,6 +328,7 @@ public class KotlinToJVMBytecodeCompiler {
? null
: IncrementalPackage.getPackagesWithRemovedFiles(
incrementalCacheProvider.getIncrementalCache(incrementalCacheDir), moduleId, environment.getSourceFiles());
BindingTraceContext diagnosticHolder = new BindingTraceContext();
GenerationState generationState = new GenerationState(
environment.getProject(),
ClassBuilderFactories.BINARIES,
@@ -341,9 +342,11 @@ public class KotlinToJVMBytecodeCompiler {
configuration.get(JVMConfigurationKeys.ENABLE_INLINE, InlineCodegenUtil.DEFAULT_INLINE_FLAG),
packagesWithRemovedFiles,
moduleId,
new BindingTraceContext() // TODO
diagnosticHolder
);
KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION);
AnalyzerWithCompilerReport.reportDiagnostics(diagnosticHolder.getBindingContext(),
environment.getConfiguration().get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY));
return generationState;
}
}