g/c: removed unwanted patches
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
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
|
||||
@@ -1,25 +0,0 @@
|
||||
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
|
||||
@@ -1,12 +0,0 @@
|
||||
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
|
||||
@@ -1,13 +0,0 @@
|
||||
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>
|
||||
|
||||
Reference in New Issue
Block a user