Skip to content

Commit 1a0c802

Browse files
committed
Make the CoreLibrary SourceSection static
1 parent e09db4d commit 1a0c802

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import java.util.function.Function;
1414

1515
import com.oracle.truffle.api.CompilerDirectives;
16-
import com.oracle.truffle.api.source.SourceSection;
1716
import org.truffleruby.RubyContext;
1817
import org.truffleruby.RubyLanguage;
1918
import org.truffleruby.collections.CachedSupplier;
19+
import org.truffleruby.core.CoreLibrary;
2020
import org.truffleruby.core.array.ArrayUtils;
2121
import org.truffleruby.core.cast.TaintResultNode;
2222
import org.truffleruby.core.klass.RubyClass;
@@ -208,7 +208,7 @@ private static void addMethod(
208208
final LexicalScope lexicalScope = new LexicalScope(context.getRootLexicalScope(), module);
209209

210210
for (String name : names) {
211-
final SharedMethodInfo sharedMethodInfo = makeSharedMethodInfo(context, lexicalScope, module, name, arity);
211+
final SharedMethodInfo sharedMethodInfo = makeSharedMethodInfo(lexicalScope, module, name, arity);
212212

213213
module.fields.addMethod(context, null, new InternalMethod(
214214
context,
@@ -223,10 +223,9 @@ private static void addMethod(
223223
}
224224
}
225225

226-
private static SharedMethodInfo makeSharedMethodInfo(RubyContext context, LexicalScope lexicalScope,
227-
RubyModule module, String name, Arity arity) {
228-
final SourceSection sourceSection = context.getCoreLibrary().sourceSection;
229-
return new SharedMethodInfo(sourceSection, lexicalScope, arity, module, name, 0, "builtin", null);
226+
private static SharedMethodInfo makeSharedMethodInfo(LexicalScope lexicalScope, RubyModule module, String name,
227+
Arity arity) {
228+
return new SharedMethodInfo(CoreLibrary.SOURCE_SECTION, lexicalScope, arity, module, name, 0, "builtin", null);
230229
}
231230

232231
private static Arity createArity(int required, int optional, boolean rest, String keywordAsOptional) {

src/main/java/org/truffleruby/core/CoreLibrary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public class CoreLibrary {
125125
private final RubyContext context;
126126
private final RubyLanguage language;
127127

128-
public final SourceSection sourceSection = initCoreSourceSection();
128+
public static final SourceSection SOURCE_SECTION = initCoreSourceSection();
129129

130130
public final RubyClass argumentErrorClass;
131131
public final RubyClass arrayClass;
@@ -263,7 +263,7 @@ public class CoreLibrary {
263263
public final String corePath;
264264

265265
@TruffleBoundary
266-
private SourceSection initCoreSourceSection() {
266+
private static SourceSection initCoreSourceSection() {
267267
final Source.SourceBuilder builder = Source.newBuilder(TruffleRuby.LANGUAGE_ID, "", "(core)");
268268
builder.internal(true);
269269

src/main/java/org/truffleruby/parser/TranslatorDriver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.truffleruby.RubyLanguage;
4646
import org.truffleruby.aot.ParserCache;
4747
import org.truffleruby.collections.Memo;
48+
import org.truffleruby.core.CoreLibrary;
4849
import org.truffleruby.core.kernel.AutoSplitNode;
4950
import org.truffleruby.core.kernel.ChompLoopNode;
5051
import org.truffleruby.core.kernel.KernelGetsNode;
@@ -438,7 +439,7 @@ private TranslatorEnvironment environmentForFrame(RubyContext context, Materiali
438439
return null;
439440
} else {
440441
final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(
441-
context.getCoreLibrary().sourceSection,
442+
CoreLibrary.SOURCE_SECTION,
442443
context.getRootLexicalScope(),
443444
Arity.NO_ARGUMENTS,
444445
null,

0 commit comments

Comments
 (0)