Drop LockBasedStorageManager.defaultDebugName, use meaningful name everywhere
Also, drop `createDelegatingWithSameLock` as it was unused
This commit is contained in:
committed by
Dmitry Savvinov
parent
893479bd5e
commit
69fff12384
@@ -494,7 +494,7 @@ open class JvmBuiltInsSettings(
|
||||
}
|
||||
}
|
||||
|
||||
private class FallbackBuiltIns private constructor() : KotlinBuiltIns(LockBasedStorageManager()) {
|
||||
private class FallbackBuiltIns private constructor() : KotlinBuiltIns(LockBasedStorageManager("FallbackBuiltIns")) {
|
||||
init {
|
||||
createBuiltInsModule()
|
||||
}
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ class RuntimeModuleData private constructor(
|
||||
|
||||
companion object {
|
||||
fun create(classLoader: ClassLoader): RuntimeModuleData {
|
||||
val storageManager = LockBasedStorageManager()
|
||||
val storageManager = LockBasedStorageManager("RuntimeModuleData")
|
||||
val builtIns = JvmBuiltIns(storageManager)
|
||||
val module = ModuleDescriptorImpl(Name.special("<runtime module for $classLoader>"), storageManager, builtIns)
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.builtins
|
||||
|
||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||
|
||||
class DefaultBuiltIns private constructor() : KotlinBuiltIns(LockBasedStorageManager()) {
|
||||
class DefaultBuiltIns private constructor() : KotlinBuiltIns(LockBasedStorageManager("DefaultBuiltIns")) {
|
||||
init {
|
||||
createBuiltInsModule()
|
||||
}
|
||||
|
||||
@@ -64,8 +64,8 @@ public class LockBasedStorageManager implements StorageManager {
|
||||
};
|
||||
|
||||
@NotNull
|
||||
public static LockBasedStorageManager createWithExceptionHandling(@NotNull ExceptionHandlingStrategy exceptionHandlingStrategy) {
|
||||
return new LockBasedStorageManager(exceptionHandlingStrategy);
|
||||
public static LockBasedStorageManager createWithExceptionHandling(@NotNull String debugText, @NotNull ExceptionHandlingStrategy exceptionHandlingStrategy) {
|
||||
return new LockBasedStorageManager(debugText, exceptionHandlingStrategy, new ReentrantLock());
|
||||
}
|
||||
|
||||
protected final Lock lock;
|
||||
@@ -82,16 +82,8 @@ public class LockBasedStorageManager implements StorageManager {
|
||||
this.debugText = debugText;
|
||||
}
|
||||
|
||||
public LockBasedStorageManager() {
|
||||
this(defaultDebugName(), ExceptionHandlingStrategy.THROW, new ReentrantLock());
|
||||
}
|
||||
|
||||
protected LockBasedStorageManager(@NotNull ExceptionHandlingStrategy exceptionHandlingStrategy) {
|
||||
this(defaultDebugName(), exceptionHandlingStrategy, new ReentrantLock());
|
||||
}
|
||||
|
||||
private static String defaultDebugName() {
|
||||
return "<unknown creating class>";
|
||||
public LockBasedStorageManager(String debugText) {
|
||||
this(debugText, ExceptionHandlingStrategy.THROW, new ReentrantLock());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -526,14 +518,6 @@ public class LockBasedStorageManager implements StorageManager {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static LockBasedStorageManager createDelegatingWithSameLock(
|
||||
@NotNull LockBasedStorageManager base,
|
||||
@NotNull ExceptionHandlingStrategy newStrategy
|
||||
) {
|
||||
return new LockBasedStorageManager(defaultDebugName(), newStrategy, base.lock);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static <T extends Throwable> T sanitizeStackTrace(@NotNull T throwable) {
|
||||
StackTraceElement[] stackTrace = throwable.getStackTrace();
|
||||
|
||||
Reference in New Issue
Block a user