diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt index b53b9f545a3..b29a6b8c635 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt @@ -95,7 +95,6 @@ class FirLibrarySession private constructor( FirSymbolProvider::class, FirCompositeSymbolProvider( listOf( - FirBuiltinSymbolProvider(this, kotlinScopeProvider), KotlinDeserializedJvmSymbolsProvider( this, sessionProvider.project, packagePartProvider, @@ -104,6 +103,7 @@ class FirLibrarySession private constructor( javaClassFinder, kotlinScopeProvider ), + FirBuiltinSymbolProvider(this, kotlinScopeProvider), javaSymbolProvider, FirDependenciesSymbolProviderImpl(this) ) diff --git a/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt b/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt index 04a339e9d8d..98e1ef12b4c 100644 --- a/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt +++ b/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt @@ -1,7 +1,6 @@ // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS // IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND_FIR: JVM_IR // No kotlin-reflect.jar in this test // WITH_RUNTIME diff --git a/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.fir.kt index 2ac880a3d4c..0eb9f3505de 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.fir.kt @@ -15,30 +15,30 @@ fun n09(p: KProperty2) = p.get("", "") fun n10() = (Foo::func).invoke(Foo("")) fun n11() = (Foo::func)(Foo("")) -fun y01() = Foo::prop.getter -fun y02() = Foo::class.members +fun y01() = Foo::prop.getter +fun y02() = Foo::class.members fun y03() = Foo::class.simpleName fun y04() = Foo::class.properties fun kclass(k: KClass<*>, kt: KClass) { k.simpleName k.qualifiedName - k.members - k.constructors - k.nestedClasses - k.objectInstance - k.typeParameters - k.supertypes - k.visibility - k.isFinal - k.isOpen - k.isAbstract - k.isSealed - k.isData - k.isInner - k.isCompanion + k.members + k.constructors + k.nestedClasses + k.objectInstance + k.typeParameters + k.supertypes + k.visibility + k.isFinal + k.isOpen + k.isAbstract + k.isSealed + k.isData + k.isInner + k.isCompanion - k.annotations + k.annotations k.isInstance(42) k == kt @@ -50,7 +50,7 @@ fun ktype(t: KType, t2: KType) { t.classifier t.arguments t.isMarkedNullable - t.annotations + t.annotations t == t2 t.hashCode()