Skip to content

Commit 5bb28cb

Browse files
committed
Remove dummy slot from encoding layout.
1 parent 75ce7ca commit 5bb28cb

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/main/java/org/truffleruby/core/encoding/EncodingLayout.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ DynamicObjectFactory createEncodingShape(DynamicObject logicalClass,
2323

2424
DynamicObject createEncoding(DynamicObjectFactory factory,
2525
Encoding encoding,
26-
DynamicObject name,
27-
boolean dummy);
26+
DynamicObject name);
2827

2928
boolean isEncoding(DynamicObject object);
3029
boolean isEncoding(Object object);
@@ -33,6 +32,4 @@ DynamicObject createEncoding(DynamicObjectFactory factory,
3332

3433
DynamicObject getName(DynamicObject object);
3534

36-
boolean getDummy(DynamicObject object);
37-
3835
}

src/main/java/org/truffleruby/core/encoding/EncodingManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ private void initializeLocaleEncoding(TruffleNFIPlatform nfi, NativeConfiguratio
170170
}
171171

172172
@TruffleBoundary
173-
private static DynamicObject newRubyEncoding(RubyContext context, Encoding encoding, byte[] name, int p, int end, boolean dummy) {
173+
private static DynamicObject newRubyEncoding(RubyContext context, Encoding encoding, byte[] name, int p, int end) {
174174
assert p == 0 : "Ropes can't be created with non-zero offset: " + p;
175175
assert end == name.length : "Ropes must have the same exact length as the name array (len = " + end + "; name.length = " + name.length + ")";
176176

177177
final Rope rope = RopeOperations.create(name, USASCIIEncoding.INSTANCE, CodeRange.CR_7BIT);
178178
final Rope cachedRope = context.getRopeCache().getRope(rope.getBytes(), rope.getEncoding(), rope.getCodeRange());
179179
final DynamicObject string = StringOperations.createFrozenString(context, cachedRope);
180180

181-
return Layouts.ENCODING.createEncoding(context.getCoreLibrary().getEncodingFactory(), encoding, string, dummy);
181+
return Layouts.ENCODING.createEncoding(context.getCoreLibrary().getEncodingFactory(), encoding, string);
182182
}
183183

184184
public static Encoding getEncoding(String name) {
@@ -240,7 +240,7 @@ public DynamicObject getRubyEncoding(Encoding encoding) {
240240
public synchronized DynamicObject defineEncoding(EncodingDB.Entry encodingEntry, byte[] name, int p, int end) {
241241
final Encoding encoding = encodingEntry.getEncoding();
242242
final int encodingIndex = encoding.getIndex();
243-
final DynamicObject rubyEncoding = newRubyEncoding(context, encoding, name, p, end, encodingEntry.isDummy());
243+
final DynamicObject rubyEncoding = newRubyEncoding(context, encoding, name, p, end);
244244

245245
assert encodingIndex >= ENCODING_LIST_BY_ENCODING_INDEX.size() || ENCODING_LIST_BY_ENCODING_INDEX.get(encodingIndex) == null;
246246

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ protected int getCacheLimit() {
421421
protected static boolean isDummy(DynamicObject encoding) {
422422
assert RubyGuards.isRubyEncoding(encoding);
423423

424-
return Layouts.ENCODING.getDummy(encoding);
424+
return Layouts.ENCODING.getEncoding(encoding).isDummy();
425425
}
426426
}
427427

0 commit comments

Comments
 (0)