Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04e0ee32ac1d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7250ae51c5f0
Choose a head ref
  • 9 commits
  • 76 files changed
  • 1 contributor

Commits on Jun 30, 2015

  1. [Truffle] Remove lots of uses of RubyArray.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    5602cfc View commit details

  2. [Truffle] Remove instanceof RubyArray.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    c3f6141 View commit details

  3. [Truffle] Remove more RubyArray parameters.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    487303b View commit details

  4. [Truffle] Remove RubyArray from AppendManyNode.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    232b219 View commit details

  5. [Truffle] Remove RubyArray from ArrayWriteNormalizedNode.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    0b0e32d View commit details

  6. [Truffle] Remove RubyArray from AppendOneNode.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    52f0251 View commit details

  7. [Truffle] Remove RubyArray from ArrayReadSliceNormalizedNode.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    38e8bcd View commit details

  8. [Truffle] Remove most of the rest of RubyArray references.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    33ff860 View commit details

  9. [Truffle] Deprecated RubyArray.

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    7250ae5 View commit details
Showing with 708 additions and 788 deletions.
  1. +5 −5 truffle/src/main/java/org/jruby/truffle/Main.java
  2. +0 −14 truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  3. +2 −3 truffle/src/main/java/org/jruby/truffle/nodes/arguments/NodeArrayToObjectArrayNode.java
  4. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ShouldDestructureNode.java
  5. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
  6. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastWithDefaultNode.java
  7. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
  8. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
  9. +10 −4 truffle/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
  10. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
  11. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
  12. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  13. +9 −15 truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java
  14. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  15. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
  16. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
  17. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/ProcessNodes.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  19. +10 −17 truffle/src/main/java/org/jruby/truffle/nodes/core/SymbolNodes.java
  20. +9 −5 truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
  21. +1 −3 truffle/src/main/java/org/jruby/truffle/nodes/core/UnboundMethodNodes.java
  22. +42 −43 truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendManyNode.java
  23. +27 −28 truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendOneNode.java
  24. +15 −15 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayBuilderNode.java
  25. +11 −11 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayConcatNode.java
  26. +10 −11 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayDropTailNode.java
  27. +10 −11 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayGetTailNode.java
  28. +18 −24 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayLiteralNode.java
  29. +304 −304 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
  30. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayPushNode.java
  31. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadDenormalizedNode.java
  32. +14 −15 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadNormalizedNode.java
  33. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadSliceDenormalizedNode.java
  34. +25 −26 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadSliceNormalizedNode.java
  35. +10 −11 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArraySliceNode.java
  36. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayWriteDenormalizedNode.java
  37. +53 −58 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayWriteNormalizedNode.java
  38. +10 −10 truffle/src/main/java/org/jruby/truffle/nodes/core/array/EnsureCapacityArrayNode.java
  39. +9 −10 truffle/src/main/java/org/jruby/truffle/nodes/core/array/GeneralizeArrayNode.java
  40. +12 −13 truffle/src/main/java/org/jruby/truffle/nodes/core/array/PopOneNode.java
  41. +11 −8 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
  42. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RespondToNode.java
  43. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RubyCallNode.java
  44. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/exceptions/RescueSplatNode.java
  45. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java
  46. +1 −19 truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyWrapperNode.java
  47. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/CallMethodNode.java
  48. +5 −6 truffle/src/main/java/org/jruby/truffle/nodes/methods/CanBindMethodToModuleNode.java
  49. +2 −3 truffle/src/main/java/org/jruby/truffle/nodes/methods/ExceptionTranslatingNode.java
  50. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/LookupMethodNode.java
  51. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetClassNode.java
  52. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java
  53. +6 −4 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
  54. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusLastStringReadNode.java
  55. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusPrimitiveCallConstructor.java
  56. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusPrimitiveConstructor.java
  57. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusPrimitiveManager.java
  58. +3 −4 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusPrimitiveNodeConstructor.java
  59. +0 −3 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java
  60. +2 −3 truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
  61. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
  62. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/time/ReadTimeZoneNode.java
  63. +4 −3 truffle/src/main/java/org/jruby/truffle/nodes/yield/YieldNode.java
  64. +2 −4 truffle/src/main/java/org/jruby/truffle/pack/nodes/PackGuards.java
  65. +3 −3 truffle/src/main/java/org/jruby/truffle/pack/nodes/type/ToStringNode.java
  66. +6 −5 truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  67. +2 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/ArrayForeignAccessFactory.java
  68. +1 −0 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java
  69. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
  70. +2 −3 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyException.java
  71. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
  72. +1 −0 truffle/src/main/java/org/jruby/truffle/runtime/hash/BucketsStrategy.java
  73. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ObjectSpaceManager.java
  74. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SourceManager.java
  75. +3 −2 truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  76. +0 −1 truffle/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
10 changes: 5 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/Main.java
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,6 @@
*/
package org.jruby.truffle;

import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;

import org.jruby.Ruby;
import org.jruby.RubyInstanceConfig;
import org.jruby.ast.RootNode;
@@ -23,6 +18,11 @@
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;

import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;

public class Main {

public static void main(String[] args) {
14 changes: 0 additions & 14 deletions truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
View file
Original file line number Diff line number Diff line change
@@ -19,10 +19,8 @@
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.source.SourceSection;

import jnr.ffi.provider.MemoryManager;
import jnr.posix.POSIX;

import org.jcodings.Encoding;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.nodes.core.array.ArrayNodes;
@@ -152,18 +150,6 @@ public RubyString executeRubyString(VirtualFrame frame) throws UnexpectedResultE
}
}

// If you try to make this RubyBasicObject things break in the DSL

public RubyArray executeRubyArray(VirtualFrame frame) throws UnexpectedResultException {
final Object value = execute(frame);

if (RubyGuards.isRubyArray(value)) {
return (RubyArray) value;
} else {
throw new UnexpectedResultException(value);
}
}

public RubyRegexp executeRubyRegexp(VirtualFrame frame) throws UnexpectedResultException {
final Object value = execute(frame);

5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/arguments/NodeArrayToObjectArrayNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,11 @@
*/
package org.jruby.truffle.nodes.arguments;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;

public class NodeArrayToObjectArrayNode extends RubyNode {

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/arguments/ShouldDestructureNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.RespondToNode;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.methods.Arity;

/**
@@ -61,7 +61,7 @@ public boolean executeBoolean(VirtualFrame frame) {
// If the single argument is a RubyArray, destructure
// TODO(CS): can we not just reply on the respondToCheck? Should experiment.

if (RubyArguments.getUserArgument(frame.getArguments(), 0) instanceof RubyArray) {
if (RubyGuards.isRubyArray(RubyArguments.getUserArgument(frame.getArguments(), 0))) {
return true;
}

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.array.ArrayNodes;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
@@ -22,7 +23,6 @@
import org.jruby.truffle.nodes.dispatch.MissingBehavior;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;

/*
@@ -103,7 +103,7 @@ public Object cast(VirtualFrame frame, RubyBasicObject object) {
return nil();
}

if (!(result instanceof RubyArray)) {
if (!RubyGuards.isRubyArray(result)) {
CompilerDirectives.transferToInterpreter();
throw new RaiseException(getContext().getCoreLibrary().typeErrorShouldReturn(object.toString(), "to_ary", "Array", this));
}
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastWithDefaultNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.array.ArrayDupNode;
import org.jruby.truffle.nodes.core.array.ArrayDupNodeGen;
@@ -24,7 +25,6 @@
import org.jruby.truffle.nodes.dispatch.MissingBehavior;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;

/**
@@ -97,8 +97,8 @@ public RubyBasicObject splat(VirtualFrame frame, Object object) {
if (respondToResult != DispatchNode.MISSING && respondToCast.executeBoolean(frame, respondToResult)) {
final Object array = toA.call(frame, object, method, null);

if (array instanceof RubyArray) {
return (RubyArray) array;
if (RubyGuards.isRubyArray(array)) {
return (RubyBasicObject) array;
} else if (array == nil() || array == DispatchNode.MISSING) {
CompilerDirectives.transferToInterpreter();
return ArrayNodes.fromObject(getContext().getCoreLibrary().getArrayClass(), object);
14 changes: 10 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,12 +13,13 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.array.ArrayNodes;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;

public class WhenSplatNode extends RubyNode {

@@ -39,12 +40,17 @@ public boolean executeBoolean(VirtualFrame frame) {

final Object caseExpression = readCaseExpression.execute(frame);

final RubyArray array;
final RubyBasicObject array;

try {
array = splat.executeRubyArray(frame);
array = splat.executeRubyBasicObject(frame);
} catch (UnexpectedResultException e) {
throw new UnsupportedOperationException(e);
throw new UnsupportedOperationException();
}

if (!RubyGuards.isRubyArray(array)) {
CompilerDirectives.transferToInterpreter();
throw new UnsupportedOperationException();
}

for (Object value : ArrayNodes.slowToArray(array)) {
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import com.oracle.truffle.api.dsl.NodeFactory;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.nodes.NodeUtil;

import org.jruby.runtime.Visibility;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.RubyRootNode;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.methods.UnsupportedOperationBehavior;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;

import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF8Encoding;
24 changes: 9 additions & 15 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,13 @@
*/
package org.jruby.truffle.nodes.core;

import java.util.EnumSet;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.*;
import com.oracle.truffle.api.source.NullSourceSection;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.ast.ArgsNode;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.runtime.Helpers;
@@ -24,25 +29,14 @@
import org.jruby.truffle.nodes.objects.ClassNodeGen;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyClass;
import org.jruby.truffle.runtime.core.RubyModule;
import org.jruby.truffle.runtime.core.RubyProc;
import org.jruby.truffle.runtime.methods.InternalMethod;
import org.jruby.truffle.runtime.object.BasicObjectType;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.object.HiddenKey;
import com.oracle.truffle.api.object.LocationModifier;
import com.oracle.truffle.api.object.Property;
import com.oracle.truffle.api.object.Shape;
import com.oracle.truffle.api.source.NullSourceSection;
import com.oracle.truffle.api.source.SourceSection;
import java.util.EnumSet;

@CoreClass(name = "Method")
public abstract class MethodNodes {
@@ -206,7 +200,7 @@ public RubyBasicObject parameters(RubyBasicObject method) {

final ArgumentDescriptor[] argsDesc = Helpers.argsNodeToArgumentDescriptors(argsNode);

return (RubyArray) getContext().toTruffle(Helpers.argumentDescriptorsToParameters(getContext().getRuntime(),
return getContext().toTruffle(Helpers.argumentDescriptorsToParameters(getContext().getRuntime(),
argsDesc, true));
}

1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;

import org.jcodings.Encoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.nodes.RubyGuards;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.core.array.ArrayNodes;
import org.jruby.truffle.nodes.dispatch.RespondToNode;
import org.jruby.truffle.runtime.ModuleOperations;
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyBinding;
import org.jruby.truffle.runtime.core.RubyProc;
@@ -170,7 +169,7 @@ public RubyBasicObject parameters(RubyProc proc) {

final ArgumentDescriptor[] argsDesc = Helpers.argsNodeToArgumentDescriptors(argsNode);

return (RubyArray) getContext().toTruffle(Helpers.argumentDescriptorsToParameters(getContext().getRuntime(),
return getContext().toTruffle(Helpers.argumentDescriptorsToParameters(getContext().getRuntime(),
argsDesc, proc.getType() == RubyProc.Type.LAMBDA));
}

2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ProcessNodes.java
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,11 @@
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.signal.SignalOperations;

import sun.misc.Signal;

@SuppressWarnings("restriction")
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ public RubyBasicObject collect(VirtualFrame frame, RubyRange.IntegerFixnumRange
count++;
}

store = arrayBuilder.append(store, n, yield(frame, block, n));
store = arrayBuilder.appendValue(store, n, yield(frame, block, n));
}
} finally {
if (CompilerDirectives.inInterpreter()) {
27 changes: 10 additions & 17 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/SymbolNodes.java
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,15 @@
*/
package org.jruby.truffle.nodes.core;

import java.util.EnumSet;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.FrameDescriptor;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.*;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyRootNode;
import org.jruby.truffle.nodes.arguments.CheckArityNode;
@@ -27,21 +34,7 @@
import org.jruby.truffle.runtime.object.BasicObjectType;
import org.jruby.util.ByteList;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.FrameDescriptor;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.object.FinalLocationException;
import com.oracle.truffle.api.object.HiddenKey;
import com.oracle.truffle.api.object.IncompatibleLocationException;
import com.oracle.truffle.api.object.LocationModifier;
import com.oracle.truffle.api.object.Property;
import com.oracle.truffle.api.object.Shape;
import com.oracle.truffle.api.source.SourceSection;
import java.util.EnumSet;

@CoreClass(name = "Symbol")
public abstract class SymbolNodes {
Loading