Skip to content

Commit 6802de1

Browse files
eregoneregon
committed
Remove unnecessary fields in CoreLibrary
1 parent 3b756ce commit 6802de1

File tree

1 file changed

+17
-35
lines changed

1 file changed

+17
-35
lines changed

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

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public class CoreLibrary {
9898
private final DynamicObjectFactory arrayFactory;
9999
private final DynamicObject basicObjectClass;
100100
private final DynamicObjectFactory bignumFactory;
101-
private final DynamicObject bindingClass;
102101
private final DynamicObjectFactory bindingFactory;
103102
private final DynamicObject classClass;
104103
private final DynamicObject complexClass;
@@ -109,7 +108,6 @@ public class CoreLibrary {
109108
private final DynamicObject encodingErrorClass;
110109
private final DynamicObject exceptionClass;
111110
private final DynamicObject falseClass;
112-
private final DynamicObject fiberClass;
113111
private final DynamicObjectFactory fiberFactory;
114112
private final DynamicObject floatClass;
115113
private final DynamicObject floatDomainErrorClass;
@@ -123,7 +121,6 @@ public class CoreLibrary {
123121
private final DynamicObject loadErrorClass;
124122
private final DynamicObject localJumpErrorClass;
125123
private final DynamicObject matchDataClass;
126-
private final DynamicObjectFactory matchDataFactory;
127124
private final DynamicObject moduleClass;
128125
private final DynamicObject nameErrorClass;
129126
private final DynamicObjectFactory nameErrorFactory;
@@ -143,7 +140,6 @@ public class CoreLibrary {
143140
private final DynamicObjectFactory longRangeFactory;
144141
private final DynamicObject rangeErrorClass;
145142
private final DynamicObject rationalClass;
146-
private final DynamicObject regexpClass;
147143
private final DynamicObjectFactory regexpFactory;
148144
private final DynamicObject regexpErrorClass;
149145
private final DynamicObject graalErrorClass;
@@ -161,11 +157,7 @@ public class CoreLibrary {
161157
private final DynamicObject systemExitClass;
162158
private final DynamicObject threadClass;
163159
private final DynamicObjectFactory threadFactory;
164-
private final DynamicObject threadBacktraceClass;
165-
private final DynamicObject threadBacktraceLocationClass;
166160
private final DynamicObjectFactory threadBacktraceLocationFactory;
167-
private final DynamicObject timeClass;
168-
private final DynamicObjectFactory timeFactory;
169161
private final DynamicObject trueClass;
170162
private final DynamicObject typeErrorClass;
171163
private final DynamicObject zeroDivisionErrorClass;
@@ -189,31 +181,22 @@ public class CoreLibrary {
189181
private final DynamicObject bigDecimalOperationsModule;
190182
private final DynamicObject encodingCompatibilityErrorClass;
191183
private final DynamicObject encodingUndefinedConversionErrorClass;
192-
private final DynamicObject methodClass;
193184
private final DynamicObjectFactory methodFactory;
194-
private final DynamicObject unboundMethodClass;
195185
private final DynamicObjectFactory unboundMethodFactory;
196-
private final DynamicObject byteArrayClass;
197186
private final DynamicObjectFactory byteArrayFactory;
198187
private final DynamicObject fiberErrorClass;
199188
private final DynamicObject threadErrorClass;
200189
private final DynamicObject objectSpaceModule;
201-
private final DynamicObject randomizerClass;
202190
private final DynamicObjectFactory randomizerFactory;
203-
private final DynamicObject atomicReferenceClass;
204-
private final DynamicObject handleClass;
205191
private final DynamicObjectFactory handleFactory;
206192
private final DynamicObject ioClass;
207-
private final DynamicObject stopIterationClass;
208193
private final DynamicObject closedQueueErrorClass;
209194
private final DynamicObject warningModule;
210195

211196
private final DynamicObject argv;
212197
private final GlobalVariables globalVariables;
213198
private final DynamicObject mainObject;
214199
private final DynamicObject nil;
215-
private final Object supportUndefined;
216-
private final DynamicObject digestClass;
217200
private final DynamicObjectFactory digestFactory;
218201
private final DynamicObject structClass;
219202

@@ -377,7 +360,7 @@ public CoreLibrary(RubyContext context) {
377360
// StandardError > IndexError
378361
indexErrorClass = defineClass(standardErrorClass, "IndexError");
379362
keyErrorClass = defineClass(indexErrorClass, "KeyError");
380-
stopIterationClass = defineClass(indexErrorClass, "StopIteration");
363+
DynamicObject stopIterationClass = defineClass(indexErrorClass, "StopIteration");
381364
closedQueueErrorClass = defineClass(stopIterationClass, "ClosedQueueError");
382365

383366
// StandardError > IOError
@@ -432,7 +415,7 @@ public CoreLibrary(RubyContext context) {
432415
arrayClass = defineClass("Array");
433416
arrayFactory = Layouts.ARRAY.createArrayShape(arrayClass, arrayClass);
434417
Layouts.CLASS.setInstanceFactoryUnsafe(arrayClass, arrayFactory);
435-
bindingClass = defineClass("Binding");
418+
DynamicObject bindingClass = defineClass("Binding");
436419
bindingFactory = Layouts.BINDING.createBindingShape(bindingClass, bindingClass);
437420
Layouts.CLASS.setInstanceFactoryUnsafe(bindingClass, bindingFactory);
438421
defineClass("Data"); // Needed by Socket::Ifaddr and defined in core MRI
@@ -441,7 +424,7 @@ public CoreLibrary(RubyContext context) {
441424
encodingFactory = Layouts.ENCODING.createEncodingShape(encodingClass, encodingClass);
442425
Layouts.CLASS.setInstanceFactoryUnsafe(encodingClass, encodingFactory);
443426
falseClass = defineClass("FalseClass");
444-
fiberClass = defineClass("Fiber");
427+
DynamicObject fiberClass = defineClass("Fiber");
445428
fiberFactory = Layouts.FIBER.createFiberShape(fiberClass, fiberClass);
446429
Layouts.CLASS.setInstanceFactoryUnsafe(fiberClass, fiberFactory);
447430
defineModule("FileTest");
@@ -454,9 +437,9 @@ public CoreLibrary(RubyContext context) {
454437
}
455438
Layouts.CLASS.setInstanceFactoryUnsafe(hashClass, hashFactory);
456439
matchDataClass = defineClass("MatchData");
457-
matchDataFactory = Layouts.MATCH_DATA.createMatchDataShape(matchDataClass, matchDataClass);
440+
DynamicObjectFactory matchDataFactory = Layouts.MATCH_DATA.createMatchDataShape(matchDataClass, matchDataClass);
458441
Layouts.CLASS.setInstanceFactoryUnsafe(matchDataClass, matchDataFactory);
459-
methodClass = defineClass("Method");
442+
DynamicObject methodClass = defineClass("Method");
460443
methodFactory = Layouts.METHOD.createMethodShape(methodClass, methodClass);
461444
Layouts.CLASS.setInstanceFactoryUnsafe(methodClass, methodFactory);
462445
final DynamicObject mutexClass = defineClass("Mutex");
@@ -480,7 +463,7 @@ public CoreLibrary(RubyContext context) {
480463
Layouts.OBJECT_RANGE.createObjectRangeShape(rangeClass, rangeClass));
481464
intRangeFactory = Layouts.INT_RANGE.createIntRangeShape(rangeClass, rangeClass);
482465
longRangeFactory = Layouts.LONG_RANGE.createLongRangeShape(rangeClass, rangeClass);
483-
regexpClass = defineClass("Regexp");
466+
DynamicObject regexpClass = defineClass("Regexp");
484467
regexpFactory = Layouts.REGEXP.createRegexpShape(regexpClass, regexpClass);
485468
Layouts.CLASS.setInstanceFactoryUnsafe(regexpClass, regexpFactory);
486469
stringClass = defineClass("String");
@@ -495,16 +478,16 @@ public CoreLibrary(RubyContext context) {
495478
threadFactory = Layouts.THREAD.createThreadShape(threadClass, threadClass);
496479
Layouts.CLASS.setInstanceFactoryUnsafe(threadClass, threadFactory);
497480

498-
threadBacktraceClass = defineClass(threadClass, objectClass, "Backtrace");
499-
threadBacktraceLocationClass = defineClass(threadBacktraceClass, objectClass, "Location");
481+
DynamicObject threadBacktraceClass = defineClass(threadClass, objectClass, "Backtrace");
482+
DynamicObject threadBacktraceLocationClass = defineClass(threadBacktraceClass, objectClass, "Location");
500483
threadBacktraceLocationFactory = ThreadBacktraceLocationLayoutImpl.INSTANCE
501484
.createThreadBacktraceLocationShape(threadBacktraceLocationClass, threadBacktraceLocationClass);
502485
Layouts.CLASS.setInstanceFactoryUnsafe(threadBacktraceLocationClass, threadBacktraceLocationFactory);
503-
timeClass = defineClass("Time");
504-
timeFactory = Layouts.TIME.createTimeShape(timeClass, timeClass);
486+
DynamicObject timeClass = defineClass("Time");
487+
DynamicObjectFactory timeFactory = Layouts.TIME.createTimeShape(timeClass, timeClass);
505488
Layouts.CLASS.setInstanceFactoryUnsafe(timeClass, timeFactory);
506489
trueClass = defineClass("TrueClass");
507-
unboundMethodClass = defineClass("UnboundMethod");
490+
DynamicObject unboundMethodClass = defineClass("UnboundMethod");
508491
unboundMethodFactory = Layouts.UNBOUND_METHOD.createUnboundMethodShape(unboundMethodClass, unboundMethodClass);
509492
Layouts.CLASS.setInstanceFactoryUnsafe(unboundMethodClass, unboundMethodFactory);
510493
ioClass = defineClass("IO");
@@ -546,7 +529,7 @@ public CoreLibrary(RubyContext context) {
546529
.createEncodingConverterShape(encodingConverterClass, encodingConverterClass));
547530

548531
final DynamicObject truffleRubyModule = defineModule("TruffleRuby");
549-
atomicReferenceClass = defineClass(truffleRubyModule, objectClass, "AtomicReference");
532+
DynamicObject atomicReferenceClass = defineClass(truffleRubyModule, objectClass, "AtomicReference");
550533
Layouts.CLASS.setInstanceFactoryUnsafe(
551534
atomicReferenceClass,
552535
Layouts.ATOMIC_REFERENCE.createAtomicReferenceShape(atomicReferenceClass, atomicReferenceClass));
@@ -574,7 +557,7 @@ public CoreLibrary(RubyContext context) {
574557
defineModule(truffleModule, "ReadlineHistory");
575558
truffleThreadOperationsModule = defineModule(truffleModule, "ThreadOperations");
576559
defineModule(truffleModule, "WeakRefOperations");
577-
handleClass = defineClass(truffleModule, objectClass, "Handle");
560+
DynamicObject handleClass = defineClass(truffleModule, objectClass, "Handle");
578561
handleFactory = Layouts.HANDLE.createHandleShape(handleClass, handleClass);
579562
Layouts.CLASS.setInstanceFactoryUnsafe(handleClass, handleFactory);
580563
defineModule("Polyglot");
@@ -596,18 +579,18 @@ public CoreLibrary(RubyContext context) {
596579

597580
truffleTypeModule = defineModule(truffleModule, "Type");
598581

599-
byteArrayClass = defineClass(truffleModule, objectClass, "ByteArray");
582+
DynamicObject byteArrayClass = defineClass(truffleModule, objectClass, "ByteArray");
600583
byteArrayFactory = Layouts.BYTE_ARRAY.createByteArrayShape(byteArrayClass, byteArrayClass);
601584
Layouts.CLASS.setInstanceFactoryUnsafe(byteArrayClass, byteArrayFactory);
602585
defineClass(truffleModule, objectClass, "StringData");
603586
defineClass(encodingClass, objectClass, "Transcoding");
604-
randomizerClass = defineClass(truffleModule, objectClass, "Randomizer");
587+
DynamicObject randomizerClass = defineClass(truffleModule, objectClass, "Randomizer");
605588
randomizerFactory = Layouts.RANDOMIZER.createRandomizerShape(randomizerClass, randomizerClass);
606589
Layouts.CLASS.setInstanceFactoryUnsafe(randomizerClass, randomizerFactory);
607590

608591
// Standard library
609592

610-
digestClass = defineClass(truffleModule, basicObjectClass, "Digest");
593+
DynamicObject digestClass = defineClass(truffleModule, basicObjectClass, "Digest");
611594
digestFactory = Layouts.DIGEST.createDigestShape(digestClass, digestClass);
612595
Layouts.CLASS.setInstanceFactoryUnsafe(digestClass, digestFactory);
613596

@@ -621,7 +604,6 @@ public CoreLibrary(RubyContext context) {
621604
nil = nilFactory.newInstance();
622605
emptyDescriptor = new FrameDescriptor(nil);
623606
argv = Layouts.ARRAY.createArray(arrayFactory, ArrayStrategy.NULL_ARRAY_STORE, 0);
624-
supportUndefined = NotProvided.INSTANCE;
625607

626608
globalVariables = new GlobalVariables(nil);
627609

@@ -772,7 +754,7 @@ private void initializeConstants() {
772754

773755
setConstant(objectClass, "ARGV", argv);
774756

775-
setConstant(truffleModule, "UNDEFINED", supportUndefined);
757+
setConstant(truffleModule, "UNDEFINED", NotProvided.INSTANCE);
776758

777759
setConstant(encodingConverterClass, "INVALID_MASK", EConvFlags.INVALID_MASK);
778760
setConstant(encodingConverterClass, "INVALID_REPLACE", EConvFlags.INVALID_REPLACE);

0 commit comments

Comments
 (0)