Skip to content

Commit c39aadc

Browse files
committed
Use Env#isPreInitializingContext() instead of a workaround
* It did not exist back then.
1 parent 0caf91e commit c39aadc

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

src/main/java/org/truffleruby/RubyContext.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,10 @@ public class RubyContext {
151151
private final AssumedValue<Boolean> warningCategoryDeprecated;
152152
private final AssumedValue<Boolean> warningCategoryExperimental;
153153

154-
private static boolean preInitializeContexts = TruffleRuby.PRE_INITIALIZE_CONTEXTS;
155-
156-
private static boolean isPreInitializingContext() {
157-
boolean isPreInitializingContext = preInitializeContexts;
158-
preInitializeContexts = false; // Only the first context is pre-initialized
159-
return isPreInitializingContext;
160-
}
161-
162154
public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
163155
Metrics.printTime("before-context-constructor");
164156

165-
this.preInitializing = isPreInitializingContext();
157+
this.preInitializing = env.isPreInitialization();
166158
this.preInitialized = preInitializing;
167159

168160
preInitializationManager = preInitializing ? new PreInitializationManager() : null;

src/shared/java/org/truffleruby/shared/TruffleRuby.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public class TruffleRuby {
2323
public static final String BOOT_SOURCE_NAME = "main_boot_source";
2424
public static final String RUBY_COPYRIGHT = "truffleruby - Copyright (c) 2013-" +
2525
BuildInformationImpl.INSTANCE.getCopyrightYear() + " Oracle and/or its affiliates";
26-
public static final boolean PRE_INITIALIZE_CONTEXTS = System
27-
.getProperty("polyglot.image-build-time.PreinitializeContexts") != null;
2826

2927
public static String getVersionString(String implementationName) {
3028
final String buildName = BuildInformationImpl.INSTANCE.getBuildName();

0 commit comments

Comments
 (0)