Skip to content

Commit cade325

Browse files
committed
Cleanups
1 parent 13b0af6 commit cade325

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ public static GetSpecialVariableStorage create() {
222222
return GetSpecialVariableStorageNodeGen.create();
223223
}
224224

225+
public static GetSpecialVariableStorage getUncached() {
226+
return GetSpecialVariableStorageNodeGen.getUncached();
227+
}
228+
225229
public abstract SpecialVariableStorage execute(Frame frame);
226230

227231
@Specialization(guards = "frame.getFrameDescriptor() == descriptor", limit = "1")
@@ -248,7 +252,7 @@ protected SpecialVariableStorage slowPath(Frame frame) {
248252
}
249253

250254
@TruffleBoundary
251-
public static SpecialVariableStorage getSlow(MaterializedFrame aFrame) {
255+
private static SpecialVariableStorage getSlow(MaterializedFrame aFrame) {
252256
MaterializedFrame frame = FindDeclarationVariableNodes.getOuterDeclarationFrame(aFrame);
253257
Object variables = SpecialVariableStorage.get(frame);
254258
if (variables == Nil.INSTANCE) {

src/main/java/org/truffleruby/core/thread/TruffleThreadNodes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ protected Object findRubyCaller(RubyArray modules,
6161
if (data == null) {
6262
return nil;
6363
} else {
64-
//ReadCallerVariablesNode.notifyCallerToSendSpecialVariables(data.callNode);
6564
Object variables = storageNode.execute(data.frame.materialize());
6665
getLanguage().getCurrentFiber().extensionCallStack.setSpecialVariables(variables);
6766
return variables;

src/main/java/org/truffleruby/language/arguments/ReadCallerVariablesNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ protected SpecialVariableStorage getCallerSpecialVariables() {
5353
this));
5454
}
5555

56-
return GetSpecialVariableStorage.getSlow(callerFrame);
56+
return GetSpecialVariableStorage.getUncached().execute(callerFrame);
5757
}
5858
}

src/main/java/org/truffleruby/language/dispatch/DispatchMethodMissingNode.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@
3434
@ImportStatic(MissingBehavior.class)
3535
public abstract class DispatchMethodMissingNode extends RubyBaseNode {
3636

37-
3837
public abstract Object execute(Frame frame, Object receiver, String methodName, Object[] rubyArgs,
3938
DispatchConfiguration config, LiteralCallNode literalCallNode);
4039

41-
4240
@Specialization(guards = "config.missingBehavior == RETURN_MISSING")
4341
protected static Object dispatchReturnMissing(
4442
Frame frame,

0 commit comments

Comments
 (0)