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

native.backend: dummy one

Browse Source
This commit is contained in:
Vasily Levchenko
2016-09-27 14:48:29 +03:00
parent de28bfaa9c
commit 7db858edda
12 changed files with 220 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
experiments/backend.native/backend.native.patch
+34
View File
@@ -0,0 +1,34 @@
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 35bbf20..cfbb3dc 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -15,5 +15,6 @@
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="backend.jvm" />
<orderEntry type="module" module-name="ir.tree" />
+ <orderEntry type="module" module-name="backend.native" />
</component>
</module>
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 39077d2..f0cbb87 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.ModificationTracker
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
+import org.jetbrains.kotlin.backend.native.NativeIrCodegenFactory
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.codegen.*
import org.jetbrains.kotlin.codegen.`when`.MappingsClassesForWhenByEnum
@@ -69,7 +70,8 @@ class GenerationState @JvmOverloads constructor(
// TODO: get rid of it with the proper module infrastructure
val outDirectory: File? = null,
private val onIndependentPartCompilationEnd: GenerationStateEventCallback = GenerationStateEventCallback.DO_NOTHING,
- val codegenFactory: CodegenFactory = if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory else DefaultCodegenFactory
+ //val codegenFactory: CodegenFactory = if (configuration.getBoolean(JVMConfigurationKeys.IR)) NativeIrCodegenFactory else DefaultCodegenFactory
+ val codegenFactory: CodegenFactory = NativeIrCodegenFactory
) {
abstract class GenerateClassFilter {
abstract fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean
experiments/backend.native/bc.frontend/build.gradle
+11
View File
@@ -0,0 +1,11 @@
buildscript {
ext.kotlin_version = '1.0.3'
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
experiments/backend.native/build.gradle
+57
View File
@@ -0,0 +1,57 @@
buildscript {
ext.kotlin_version = '1.0.3'
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
dependencies {
compile files('../kotlin-ir/dist//kotlin-build-common-sources.jar',
'../kotlin-ir/dist//kotlin-compiler-before-shrink.jar',
'../kotlin-ir/dist//kotlin-compiler-for-maven.jar',
'../kotlin-ir/dist//kotlin-compiler-javadoc.jar',
'../kotlin-ir/dist//kotlin-compiler-sources.jar',
'../kotlin-ir/dist//kotlin-mock-runtime-for-test.jar',
'../kotlin-ir/dist//kotlin-reflect-before-jarjar.jar',
'../kotlin-ir/dist//kotlin-reflect-jarjar.jar',
'../kotlin-ir/dist//kotlin-reflect-sources-for-maven.jar',
'../kotlin-ir/dist//kotlinc/lib/android-extensions-compiler.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-annotation-processing.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-ant.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-build-common-test.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-build-common.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-compiler.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-daemon-client.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-jslib-sources.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-jslib.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-preloader.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-reflect-internal-bootstrap.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-reflect.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-runner.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-runtime-internal-bootstrap.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-runtime-sources.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-runtime.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-test-internal-bootstrap.jar',
'../kotlin-ir/dist//kotlinc/lib/kotlin-test.jar')
}
sourceSets {
main.java.srcDirs += 'compiler/ir/backend.native/src/'
main.kotlin.srcDirs += 'compiler/ir/backend.native/src/'
}
task jars {
project.buildscript.configurations.classpath.each {
String jarName = it.getName();
print jarName + ":"
}
}
experiments/backend.native/cli.bc/.log
View File
experiments/backend.native/cli.bc/build.gradle
+57
View File
@@ -0,0 +1,57 @@
buildscript {
ext.kotlin_version = '1.0.3'
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
dependencies {
compile files('../../kotlin-ir/dist//kotlin-build-common-sources.jar',
'../../kotlin-ir/dist//kotlin-compiler-before-shrink.jar',
'../../kotlin-ir/dist//kotlin-compiler-for-maven.jar',
'../../kotlin-ir/dist//kotlin-compiler-javadoc.jar',
'../../kotlin-ir/dist//kotlin-compiler-sources.jar',
'../../kotlin-ir/dist//kotlin-mock-runtime-for-test.jar',
'../../kotlin-ir/dist//kotlin-reflect-before-jarjar.jar',
'../../kotlin-ir/dist//kotlin-reflect-jarjar.jar',
'../../kotlin-ir/dist//kotlin-reflect-sources-for-maven.jar',
'../../kotlin-ir/dist//kotlinc/lib/android-extensions-compiler.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-annotation-processing.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-ant.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-build-common-test.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-build-common.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-compiler.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-daemon-client.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-jslib-sources.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-jslib.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-preloader.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-reflect-internal-bootstrap.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-reflect.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-runner.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-runtime-internal-bootstrap.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-runtime-sources.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-runtime.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-test-internal-bootstrap.jar',
'../../kotlin-ir/dist//kotlinc/lib/kotlin-test.jar')
}
sourceSets {
main.java.srcDirs += 'src'
main.kotlin.srcDirs += 'src'
}
task jars {
project.buildscript.configurations.classpath.each {
String jarName = it.getName();
print jarName + ":"
}
}
experiments/backend.native/cli.native/cli.native.iml → experiments/backend.native/cli.bc/cli.bc.iml
View File
experiments/backend.native/cli.native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt → experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
-4
View File
@@ -21,10 +21,6 @@ import java.lang.System.out
import java.util.Collections.emptyList
import kotlin.reflect.jvm.internal.impl.load.java.JvmAbi
/**
* Created by minamoto on 14/09/16.
*/
class K2Native : CLICompiler<K2NativeCompilerArguments>() {
override fun doExecute(arguments: K2NativeCompilerArguments, configuration: CompilerConfiguration, rootDisposable: Disposable): ExitCode {
configuration.put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME)
experiments/backend.native/cli.native/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java → experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java
View File
experiments/backend.native/compiler/build.gradle
+11
View File
@@ -0,0 +1,11 @@
buildscript {
ext.kotlin_version = '1.0.3'
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
experiments/backend.native/fix_core_imports.patch
+25
View File
@@ -0,0 +1,25 @@
diff --git a/core/builtins/src/kotlin/Progressions.kt b/core/builtins/src/kotlin/Progressions.kt
index 704d49f..509baaa 100644
--- a/core/builtins/src/kotlin/Progressions.kt
+++ b/core/builtins/src/kotlin/Progressions.kt
@@ -18,6 +18,7 @@
package kotlin.ranges
+import java.lang.IllegalArgumentException
import kotlin.internal.getProgressionLastElement
/**
diff --git a/core/builtins/src/kotlin/internal/progressionUtil.kt b/core/builtins/src/kotlin/internal/progressionUtil.kt
index 026c99f..f7a222e 100644
--- a/core/builtins/src/kotlin/internal/progressionUtil.kt
+++ b/core/builtins/src/kotlin/internal/progressionUtil.kt
@@ -16,6 +16,8 @@
package kotlin.internal
+import java.lang.IllegalArgumentException
+
// a mod b (in arithmetical sense)
private fun mod(a: Int, b: Int): Int {
val mod = a % b
experiments/backend.native/frontend.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 15545cc..00b8bed 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -15,5 +15,6 @@
<orderEntry type="module" module-name="container" exported="" />
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="module" module-name="resolution" exported="" />
+ <orderEntry type="module" module-name="runtime.jvm" />
</component>
</module>
\ No newline at end of file
experiments/backend.native/update_dependencies.xml.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/update_dependencies.xml b/update_dependencies.xml
index cbfcb42..b5c029f 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -74,7 +74,7 @@
<target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies for JB local network">
<execute_update_with_idea_maven_artifacts
- base.url="http://jetbrains-com-mirror.labs.intellij.net/intellij-repository/releases/com/jetbrains/intellij/idea"
+ base.url="http://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea"
idea.maven.version="${ideaVersion}"/>
</target>