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

Use correct class loader to load .kotlin_builtins in reflection

Browse Source 
#KT-30749 Fixed
This commit is contained in:
Alexander Udalov
2019-04-03 11:43:56 +02:00
parent 3de723b8d0
commit 5bafd4008f
4 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt
+4 -1
View File
@@ -87,8 +87,11 @@ class RuntimeModuleData private constructor(
binaryClassAnnotationAndConstantLoader, lazyJavaPackageFragmentProvider, notFoundClasses,
RuntimeErrorReporter, LookupTracker.DO_NOTHING, ContractDeserializer.DEFAULT
)
// .kotlin_builtins files should be found by the same class loader that loaded stdlib classes
val stdlibClassLoader = Unit::class.java.classLoader
val builtinsProvider = JvmBuiltInsPackageFragmentProvider(
storageManager, reflectKotlinClassFinder, module, notFoundClasses, builtIns.settings, builtIns.settings,
storageManager, ReflectKotlinClassFinder(stdlibClassLoader), module, notFoundClasses, builtIns.settings, builtIns.settings,
DeserializationConfiguration.Default
)