diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt index c0350b16c3b..e4549fdf325 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt @@ -32,19 +32,6 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator -class NativeAnalyzer( - val environment: KotlinCoreEnvironment, - val sources: Collection, - val konanConfig: KonanConfig) : AnalyzerWithCompilerReport.Analyzer { - - override fun analyze(): AnalysisResult { - return TopDownAnalyzerFacadeForKonan.analyzeFiles(sources, konanConfig); - } - - override fun reportEnvironmentErrors() { - } -} - public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironment) { val config = konanConfig.configuration @@ -69,8 +56,9 @@ public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEn phaser.phase(KonanPhase.FRONTEND) { // Build AST and binding info. - analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles(), - NativeAnalyzer(environment, environment.getSourceFiles(), konanConfig)) + analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles()) { + TopDownAnalyzerFacadeForKonan.analyzeFiles(environment.getSourceFiles(), konanConfig) + } if (analyzerWithCompilerReport.hasErrors()) { throw KonanCompilationException() } diff --git a/gradle.properties b/gradle.properties index 387b3371d43..6aca5237de1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,6 @@ testDataVersion=1067176:id kotlinCompilerRepo=http://dl.bintray.com/jetbrains/kotlin-native-dependencies #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev -kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170708.201339-666 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170724.005554-711 konanVersion=0.3 org.gradle.jvmargs='-Dfile.encoding=UTF-8'