File tree Expand file tree Collapse file tree 2 files changed +5
-18
lines changed
src/main/java/org/truffleruby/stdlib Expand file tree Collapse file tree 2 files changed +5
-18
lines changed Original file line number Diff line number Diff line change @@ -152,11 +152,9 @@ def dump_all(output: :file)
152
152
module_function :dump_all
153
153
154
154
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?
160
158
end
161
159
module_function :memsize_of
162
160
Original file line number Diff line number Diff line change @@ -71,25 +71,14 @@ public int memsize(Object object) {
71
71
}
72
72
}
73
73
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
-
85
74
@ CoreMethod (names = "sizer" , isModuleFunction = true , required = 1 )
86
75
public abstract static class GetMemSizer extends CoreMethodArrayArgumentsNode {
87
76
88
- @ Child private ReadObjectFieldNode setSizerNode = ReadObjectFieldNodeGen .create (Layouts .MEMSIZER_IDENTIFIER , nil ());
77
+ @ Child private ReadObjectFieldNode readSizerNode = ReadObjectFieldNodeGen .create (Layouts .MEMSIZER_IDENTIFIER , nil ());
89
78
90
79
@ Specialization
91
80
public Object hasSizer (DynamicObject object ) {
92
- return setSizerNode .execute (object );
81
+ return readSizerNode .execute (object );
93
82
}
94
83
}
95
84
You can’t perform that action at this time.
0 commit comments