Skip to content

Commit 9e71201

Browse files
committed
Changes based on review.
1 parent 2371319 commit 9e71201

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

lib/truffle/objspace.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,9 @@ def dump_all(output: :file)
152152
module_function :dump_all
153153

154154
def memsize_of(object)
155-
unless Truffle::ObjSpace.has_sizer?(object)
156-
Truffle::ObjSpace.memsize_of(object)
157-
else
158-
Truffle::ObjSpace.memsize_of(object) + Truffle::ObjSpace.sizer(object).call
159-
end
155+
size = Truffle::ObjSpace.memsize_of(object)
156+
157+
size + Truffle::ObjSpace.sizer(object).call unless Truffle::ObjSpace.sizer(object).nil?
160158
end
161159
module_function :memsize_of
162160

src/main/java/org/truffleruby/stdlib/ObjSpaceNodes.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,14 @@ public int memsize(Object object) {
7171
}
7272
}
7373

74-
@CoreMethod(names = "has_sizer?", isModuleFunction = true, required = 1)
75-
public abstract static class HasMemSizer extends CoreMethodArrayArgumentsNode {
76-
77-
@Child private ReadObjectFieldNode setSizerNode = ReadObjectFieldNodeGen.create(Layouts.MEMSIZER_IDENTIFIER, nil());
78-
79-
@Specialization
80-
public boolean hasSizer(DynamicObject object) {
81-
return setSizerNode.execute(object) != nil();
82-
}
83-
}
84-
8574
@CoreMethod(names = "sizer", isModuleFunction = true, required = 1)
8675
public abstract static class GetMemSizer extends CoreMethodArrayArgumentsNode {
8776

88-
@Child private ReadObjectFieldNode setSizerNode = ReadObjectFieldNodeGen.create(Layouts.MEMSIZER_IDENTIFIER, nil());
77+
@Child private ReadObjectFieldNode readSizerNode = ReadObjectFieldNodeGen.create(Layouts.MEMSIZER_IDENTIFIER, nil());
8978

9079
@Specialization
9180
public Object hasSizer(DynamicObject object) {
92-
return setSizerNode.execute(object);
81+
return readSizerNode.execute(object);
9382
}
9483
}
9584

0 commit comments

Comments
 (0)