azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kotlin compiler][update] 1.1-20170724.005554-711

Browse Source
This commit is contained in:
Ilya Matveev
2017-07-24 11:50:02 +07:00
committed by ilmat192
parent 0ddc002b8d
commit 295ab0a679
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
+3 -15
View File
@@ -32,19 +32,6 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
class NativeAnalyzer(
val environment: KotlinCoreEnvironment,
val sources: Collection<KtFile>,
val konanConfig: KonanConfig) : AnalyzerWithCompilerReport.Analyzer {
override fun analyze(): AnalysisResult {
return TopDownAnalyzerFacadeForKonan.analyzeFiles(sources, konanConfig);
}
override fun reportEnvironmentErrors() {
}
}
public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironment) { public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironment) {
val config = konanConfig.configuration val config = konanConfig.configuration
@@ -69,8 +56,9 @@ public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEn
phaser.phase(KonanPhase.FRONTEND) { phaser.phase(KonanPhase.FRONTEND) {
// Build AST and binding info. // Build AST and binding info.
analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles(), analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles()) {
NativeAnalyzer(environment, environment.getSourceFiles(), konanConfig)) TopDownAnalyzerFacadeForKonan.analyzeFiles(environment.getSourceFiles(), konanConfig)
}
if (analyzerWithCompilerReport.hasErrors()) { if (analyzerWithCompilerReport.hasErrors()) {
throw KonanCompilationException() throw KonanCompilationException()
} }
gradle.properties
+1 -1
View File
@@ -23,6 +23,6 @@ testDataVersion=1067176:id
kotlinCompilerRepo=http://dl.bintray.com/jetbrains/kotlin-native-dependencies kotlinCompilerRepo=http://dl.bintray.com/jetbrains/kotlin-native-dependencies
#kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
#kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev #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 konanVersion=0.3
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'