Skip to content

Commit 1a512f6

Browse files
committed
FromJavaStringNode and UnwrapNativeNode using properly executeUncached
1 parent 1db8670 commit 1a512f6

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.oracle.truffle.api.profiles.LoopConditionProfile;
2323
import org.truffleruby.RubyContext;
2424
import org.truffleruby.cext.UnwrapNode;
25+
import org.truffleruby.cext.UnwrapNode.UnwrapNativeNode;
2526
import org.truffleruby.cext.ValueWrapper;
2627
import org.truffleruby.cext.WrapNode;
2728
import org.truffleruby.core.array.ArrayGuards;
@@ -297,7 +298,7 @@ public long getAddress() {
297298
@Override
298299
public void getAdjacentObjects(Set<Object> reachable) {
299300
for (int i = 0; i < length; i++) {
300-
final Object value = UnwrapNode.UnwrapNativeNode.executeUncached(readElement(i));
301+
final Object value = UnwrapNativeNode.executeUncached(readElement(i));
301302
if (ObjectGraph.isRubyObject(value)) {
302303
reachable.add(value);
303304
}
@@ -307,7 +308,7 @@ public void getAdjacentObjects(Set<Object> reachable) {
307308
@TruffleBoundary
308309
public void preserveMembers() {
309310
for (int i = 0; i < length; i++) {
310-
final Object value = UnwrapNode.UnwrapNativeNode.executeUncached(readElement(i));
311+
final Object value = UnwrapNativeNode.executeUncached(readElement(i));
311312
markedObjects[i] = value;
312313
}
313314
}

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
import org.truffleruby.core.thread.ThreadManager;
6464
import org.truffleruby.extra.ffi.Pointer;
6565
import org.truffleruby.interop.BoxedValue;
66-
import org.truffleruby.interop.FromJavaStringNodeGen;
66+
import org.truffleruby.interop.FromJavaStringNode;
6767
import org.truffleruby.interop.ToJavaStringNode;
6868
import org.truffleruby.language.ImmutableRubyObject;
6969
import org.truffleruby.core.string.ImmutableRubyString;
@@ -1396,7 +1396,7 @@ public abstract static class PrimitiveNamesNode extends CoreMethodArrayArguments
13961396
@Specialization
13971397
protected RubyArray primitiveNames() {
13981398
var primitiveNames = getLanguage().primitiveManager.getPrimitiveNames().stream()
1399-
.map(name -> FromJavaStringNodeGen.getUncached().executeFromJavaString(this, name));
1399+
.map(FromJavaStringNode::executeUncached);
14001400

14011401
return createArray(primitiveNames.toArray());
14021402
}

src/main/java/org/truffleruby/interop/FromJavaStringNode.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public abstract class FromJavaStringNode extends RubyBaseNode {
2929

3030
public abstract RubyString executeFromJavaString(Node node, String value);
3131

32+
public static RubyString executeUncached(String value) {
33+
return FromJavaStringNodeGen.getUncached().executeFromJavaString(null, value);
34+
}
35+
3236
@Specialization(guards = "stringsEquals(cachedValue, value)", limit = "getLimit()")
3337
protected static RubyString doCached(Node node, String value,
3438
@Cached("value") String cachedValue,

0 commit comments

Comments
 (0)