FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Correctly initialize Data field accessors by headius · Pull Request #9253 · jruby/jruby · GitHub

/ jruby Public

Correctly initialize Data field accessors #9253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
headius wants to merge 2 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 2 Checks 79 Files changed
Open

Correctly initialize Data field accessors #9253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84538f1
Use prepared accessors to retrieve Data fields
headius Feb 18, 2026
73b2a99
Copy variable table manager from non-Object parents
headius Feb 18, 2026
File filter

Filter by extension

Filter by extension .java  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 9 additions & 6 deletions core/src/main/java/org/jruby/RubyClass.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ public static RubyClass newClass(Ruby runtime, RubyClass superClass, String name
return newClass(runtime.getCurrentContext(), superClass, name, allocator, parent, setParent, file, line);
}

@Deprecated
public static RubyClass newClass(ThreadContext context, RubyClass superClass, String name, ObjectAllocator allocator,
RubyModule parent, boolean setParent, String file, int line) {
assert superClass != null;
Expand All @@ -550,7 +551,6 @@ public static RubyClass newClass(ThreadContext context, RubyClass superClass, St
baseName(name);
clazz.makeMetaClass(context, superClass.getMetaClass());
if (setParent) clazz.setParent(parent);
clazz.copyVariableTableManagerForData(context, superClass);
parent.setConstant(context, name, clazz, file, line);
superClass.invokeInherited(context, superClass, clazz);
return clazz;
Expand Down Expand Up @@ -1073,7 +1073,7 @@ private RubyClass initializeCommon(ThreadContext context, RubyClass superClazz,
allocator = superClazz.allocator;
makeMetaClass(context, superClazz.getMetaClass());
superClazz.addSubclass(this);
copyVariableTableManagerForData(context, superClazz);
copyVariableTableManager(superClazz);

marshal = superClazz.marshal;

Expand All @@ -1083,11 +1083,14 @@ private RubyClass initializeCommon(ThreadContext context, RubyClass superClazz,
return this;
}

private void copyVariableTableManagerForData(ThreadContext context, RubyClass superClazz) {
private void copyVariableTableManager(RubyClass superClazz) {
if (superClazz == runtime.getObject()) {
// don't copy variables from Object since it will accumulate random variables
return;
}
VariableTableManager variableTableManager = superClazz.getVariableTableManager();
if (variableTableManager.getRealClass().superClass() == context.runtime.getData()) {
// duplicate data's variable table in subclasses
this.variableTableManager = variableTableManager.duplicateForData(this);
if (!variableTableManager.getVariableAccessorsForRead().isEmpty()) {
this.variableTableManager = variableTableManager.duplicateFor(this);
}
}

Expand Down
27 changes: 13 additions & 14 deletions core/src/main/java/org/jruby/RubyData.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static void initialize(ThreadContext context, IRubyObject self, IRubyObje
String keyString = toSymbol(context, k).idString();
VariableAccessor variableAccessor = variableAccessors.get(keyString);
if (variableAccessor != null) {
selfObj.setInternalVariable(keyString, v);
variableAccessor.set(self, v);
} else {
RubyArray unknownKeywords = unknownKeywordsPtr[0];
if (unknownKeywords == null) {
Expand Down Expand Up @@ -402,13 +402,6 @@ private static RubyClass newDataStruct(ThreadContext context, RubyClass superCla

RubyClass subclass = RubyClass.newClass(runtime, superClass);

VariableTableManager vtm = subclass.getVariableTableManager();
VariableAccessor[] accessors = new VariableAccessor[keySet.size()];
int i = 0;
for (RubySymbol sym : keySet) {
accessors[i++] = vtm.getVariableAccessorForWrite(sym.idString());
}

ObjectAllocator allocator =
runtime.getObjectSpecializer()
.specializeForVariables(
Expand All @@ -417,6 +410,18 @@ private static RubyClass newDataStruct(ThreadContext context, RubyClass superCla

subclass.allocator(allocator);

VariableTableManager vtm = subclass.getVariableTableManager();
VariableAccessor[] accessors = new VariableAccessor[keySet.size()];
int i = 0;
for (RubySymbol sym : keySet) {
VariableAccessor accessor = vtm.getVariableAccessorForWrite(sym.idString());

accessors[i++] = accessor;

// TODO: AttrReader expects to potentially see many variable tables; this could be simplified
subclass.addMethod(context, sym.idString(), new AttrReaderMethod(subclass, Visibility.PUBLIC, accessor));
}

RubyArray members = newArray(context, keySet);
members.freeze(context);
subclass.setInternalVariable(MEMBERS_KEY, members);
Expand All @@ -427,12 +432,6 @@ private static RubyClass newDataStruct(ThreadContext context, RubyClass superCla
dataSClass.undefMethods(context, "define")
.defineMethods(context, DataMethods.class);

for (RubySymbol sym : keySet) {
VariableAccessor accessor = vtm.getVariableAccessorForWrite(sym.idString());
// TODO: AttrReader expects to potentially see many variable tables; this could be simplified
subclass.addMethod(context, sym.idString(), new AttrReaderMethod(subclass, Visibility.PUBLIC, accessor));
}

return subclass;
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/ivars/VariableTableManager.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ public Object clearVariable(RubyBasicObject object, String name) {
}
}

public VariableTableManager duplicateForData(RubyClass newRealClass) {
public VariableTableManager duplicateFor(RubyClass newRealClass) {
return new VariableTableManager(this, newRealClass);
}

Expand Down
Loading
Back | FazBrowse Home | New Git URL