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

[FIR2IR] Initialize built-in symbols at start of conversion

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-28 11:20:16 +03:00
parent cd24745f1f
commit 85760770a8
34 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/build.gradle.kts
+1
View File
@@ -10,6 +10,7 @@ dependencies {
compileOnly(project(":compiler:fir:tree")) compileOnly(project(":compiler:fir:tree"))
compileOnly(project(":compiler:ir.tree")) compileOnly(project(":compiler:ir.tree"))
compileOnly(project(":compiler:ir.psi2ir")) compileOnly(project(":compiler:ir.psi2ir"))
compileOnly(project(":compiler:ir.backend.common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.backend package org.jetbrains.kotlin.fir.backend
import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.*
@@ -173,6 +174,7 @@ class Fir2IrConverter(
constantValueGenerator.typeTranslator = typeTranslator constantValueGenerator.typeTranslator = typeTranslator
typeTranslator.constantValueGenerator = constantValueGenerator typeTranslator.constantValueGenerator = constantValueGenerator
val builtIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable) val builtIns = IrBuiltIns(moduleDescriptor.builtIns, typeTranslator, symbolTable)
BuiltinSymbolsBase(builtIns, moduleDescriptor.builtIns, symbolTable)
val sourceManager = PsiSourceManager() val sourceManager = PsiSourceManager()
val components = Fir2IrComponentsStorage(session, scopeSession, symbolTable, builtIns) val components = Fir2IrComponentsStorage(session, scopeSession, symbolTable, builtIns)
val declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor) val declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor)
compiler/testData/codegen/box/arrays/kt1291.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var result = 0 var result = 0
fun <T> Iterator<T>.foreach(action: (T) -> Unit) { fun <T> Iterator<T>.foreach(action: (T) -> Unit) {
compiler/testData/codegen/box/builtinStubMethods/Iterator.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyIterator<T>(val v: T): Iterator<T> { class MyIterator<T>(val v: T): Iterator<T> {
compiler/testData/codegen/box/builtinStubMethods/IteratorWithRemove.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyIterator<T>(val v: T): Iterator<T> { class MyIterator<T>(val v: T): Iterator<T> {
compiler/testData/codegen/box/builtinStubMethods/List.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyList<T>: List<T> { class MyList<T>: List<T> {
compiler/testData/codegen/box/builtinStubMethods/ListIterator.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyListIterator<T> : ListIterator<T> { class MyListIterator<T> : ListIterator<T> {
compiler/testData/codegen/box/builtinStubMethods/ListWithAllImplementations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyList<T>(val v: T): List<T> { class MyList<T>(val v: T): List<T> {
compiler/testData/codegen/box/builtinStubMethods/ListWithAllInheritedImplementations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
open class Super<T>(val v: T) { open class Super<T>(val v: T) {
compiler/testData/codegen/box/builtinStubMethods/Map.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyMap<K, V>: Map<K, V> { class MyMap<K, V>: Map<K, V> {
compiler/testData/codegen/box/builtinStubMethods/MapEntry.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyMapEntry<K, V>: Map.Entry<K, V> { class MyMapEntry<K, V>: Map.Entry<K, V> {
compiler/testData/codegen/box/builtinStubMethods/MapEntryWithSetValue.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyMapEntry<K, V>: Map.Entry<K, V> { class MyMapEntry<K, V>: Map.Entry<K, V> {
compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyMap<K, V>: Map<K, V> { class MyMap<K, V>: Map<K, V> {
compiler/testData/codegen/box/builtinStubMethods/abstractMember.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
abstract class A : Iterator<String> { abstract class A : Iterator<String> {
compiler/testData/codegen/box/builtinStubMethods/customReadOnlyIterator.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class A : Collection<Char> { class A : Collection<Char> {
override val size: Int override val size: Int
get() = throw UnsupportedOperationException() get() = throw UnsupportedOperationException()
compiler/testData/codegen/box/builtinStubMethods/implementationInTrait.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
interface Addable { interface Addable {
compiler/testData/codegen/box/builtinStubMethods/inheritedImplementations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
open class SetStringImpl { open class SetStringImpl {
compiler/testData/codegen/box/builtinStubMethods/manyTypeParametersWithUpperBounds.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/builtinStubMethods/nonTrivialUpperBound.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
class MyIterator<E : Number> : Iterator<E> { class MyIterator<E : Number> : Iterator<E> {
compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND: JS_IR_ES6
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
compiler/testData/codegen/box/collections/readOnlyList.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// FILE: J.java // FILE: J.java
compiler/testData/codegen/box/collections/readOnlyMap.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// FILE: J.java // FILE: J.java
compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexCheckSideEffects.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVarCheckSideEffects.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVarCheckSideEffects.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
compiler/testData/codegen/box/functions/kt1038.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
//KT-1038 Cannot compile lazy iterators //KT-1038 Cannot compile lazy iterators
class YieldingIterator<T>(val yieldingFunction : ()->T?) : Iterator<T> class YieldingIterator<T>(val yieldingFunction : ()->T?) : Iterator<T>
compiler/testData/codegen/box/inlineClasses/UIntArraySortExample.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
compiler/testData/codegen/box/jdk/stream.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
compiler/testData/codegen/box/objects/flist.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
public abstract class FList<T>() { public abstract class FList<T>() {
public abstract val head: T public abstract val head: T
public abstract val tail: FList<T> public abstract val tail: FList<T>
compiler/testData/codegen/box/ranges/forInCustomIterable.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
compiler/testData/codegen/box/specialBuiltins/maps.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
class A : Map<String, String> { class A : Map<String, String> {
compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
var result = "" var result = ""