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: b9d68b42c946
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2472045de4ba
Choose a head ref
  • 2 commits
  • 72 files changed
  • 1 contributor

Commits on Dec 24, 2015

  1. [Truffle] Fix lots of uses of deprecated Truffle APIs.

    @chrisseaton
    chrisseaton committed Dec 24, 2015
    Copy the full SHA
    e12745b View commit details

  2. [Truffle] WeakRef specs problematic with value profiling.

    @chrisseaton
    chrisseaton committed Dec 24, 2015
    Copy the full SHA
    2472045 View commit details
Showing with 91 additions and 90 deletions.
  1. +1 −0 spec/truffle/tags/core/objectspace/each_object_tags.txt
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/format/nodes/PackNode.java
  3. +1 −1 truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadLongOrBigIntegerNode.java
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/format/nodes/type/ToStringNode.java
  5. +1 −1 truffle/src/main/java/org/jruby/truffle/format/nodes/write/WritePaddedBytesNode.java
  6. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadBlockNode.java
  7. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadCallerFrameNode.java
  8. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadKeywordArgumentNode.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadOptionalArgumentNode.java
  10. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadPreArgumentNode.java
  11. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadRemainingArgumentsNode.java
  12. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadRestArgumentNode.java
  13. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/arguments/ShouldDestructureNode.java
  14. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
  15. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
  16. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/constants/GetConstantNode.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/constants/LookupConstantNode.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
  19. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
  20. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
  21. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
  22. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
  23. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
  24. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
  25. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
  26. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
  27. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  29. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  30. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ReturnEnumeratorIfNoBlockNode.java
  31. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  32. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendManyNode.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendOneNode.java
  34. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayBuilderNode.java
  35. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayConcatNode.java
  36. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
  37. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadDenormalizedNode.java
  38. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadSliceDenormalizedNode.java
  39. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/array/EnsureCapacityArrayNode.java
  40. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/fixnum/FixnumNodes.java
  41. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashLiteralNode.java
  42. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNode.java
  43. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
  44. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/LookupEntryNode.java
  45. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/SetNode.java
  46. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
  47. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
  48. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java
  49. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/exceptions/EnsureNode.java
  50. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TryNode.java
  51. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java
  52. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchBreakNode.java
  53. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchForLambdaNode.java
  54. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchForMethodNode.java
  55. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchForProcNode.java
  56. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchNextNode.java
  57. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/ExceptionTranslatingNode.java
  58. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
  59. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/objects/SelfNode.java
  60. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/BignumPrimitiveNodes.java
  61. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/CallRubiniusPrimitiveNode.java
  62. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingConverterPrimitiveNodes.java
  63. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/FixnumPrimitiveNodes.java
  64. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/FloatPrimitiveNodes.java
  65. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/InvokeRubiniusPrimitiveNode.java
  66. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java
  67. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusSingleBlockArgNode.java
  68. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
  69. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/time/ReadTimeZoneNode.java
  70. +6 −6 truffle/src/main/java/org/jruby/truffle/runtime/RubyObjectType.java
  71. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/ArrayOperations.java
  72. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java
1 change: 1 addition & 0 deletions spec/truffle/tags/core/objectspace/each_object_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:ObjectSpace.each_object doesn't find an object stored in a WeakRef that should have been cleared
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/format/nodes/PackNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.frame.FrameSlotTypeException;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.format.runtime.PackFrameDescriptor;
import org.jruby.truffle.format.runtime.exceptions.TooFewArgumentsException;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadLongOrBigIntegerNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import com.oracle.truffle.api.dsl.NodeChildren;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.format.nodes.PackGuards;
import org.jruby.truffle.format.nodes.PackNode;
import org.jruby.truffle.format.nodes.SourceNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/format/nodes/type/ToStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.KernelNodes;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/format/nodes/write/WritePaddedBytesNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.dsl.NodeChildren;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.format.nodes.PackNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.util.ByteList;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadBlockNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadCallerFrameNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyArguments;
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadKeywordArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.utilities.ValueProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.api.profiles.ValueProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
@@ -28,7 +28,7 @@ public class ReadKeywordArgumentNode extends RubyNode {
private final int minimum;
private final String name;
private final int kwIndex;
private final ValueProfile argumentValueProfile = ValueProfile.createPrimitiveProfile();
private final ValueProfile argumentValueProfile = ValueProfile.createEqualityProfile();

private final ConditionProfile optimizedProfile = ConditionProfile.createBinaryProfile();
private final ConditionProfile defaultProfile = ConditionProfile.createBinaryProfile();
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadOptionalArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadPreArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ValueProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ValueProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyArguments;
@@ -28,7 +28,7 @@ public class ReadPreArgumentNode extends RubyNode {
private final BranchProfile outOfRangeProfile = BranchProfile.create();
private final MissingArgumentBehaviour missingArgumentBehaviour;

private final ValueProfile argumentValueProfile = ValueProfile.createPrimitiveProfile();
private final ValueProfile argumentValueProfile = ValueProfile.createEqualityProfile();

public ReadPreArgumentNode(RubyContext context, SourceSection sourceSection, int index, MissingArgumentBehaviour missingArgumentBehaviour) {
super(context, sourceSection);
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadRemainingArgumentsNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ReadRestArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/arguments/ShouldDestructureNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;

import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.objects.IsTaintedNode;
import org.jruby.truffle.nodes.objects.IsTaintedNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.FloatNodes;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/constants/GetConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.KernelNodes.RequireNode;
import org.jruby.truffle.nodes.core.KernelNodesFactory;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/constants/LookupConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.ModuleOperations;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.nodes.RepeatingNode;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;

import org.jcodings.specific.USASCIIEncoding;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;

import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jcodings.Encoding;
import org.jcodings.EncodingDB;
import org.jcodings.specific.ASCIIEncoding;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jcodings.specific.USASCIIEncoding;
import org.jruby.runtime.Visibility;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.ToSNode;
2 changes: 1 addition & 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
@@ -24,7 +24,7 @@
import com.oracle.truffle.api.object.Property;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.utilities.ValueProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.api.profiles.ValueProfile;

import org.jcodings.Encoding;
import org.jcodings.specific.UTF8Encoding;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/ReturnEnumeratorIfNoBlockNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import jnr.posix.POSIX;
import org.jcodings.Encoding;
import org.jcodings.exception.EncodingException;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendManyNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.array.ArrayMirror;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/AppendOneNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.array.ArrayMirror;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayBuilderNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.constants.RestartableReadConstantNode;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayConcatNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF8Encoding;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadDenormalizedNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayReadSliceDenormalizedNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/array/EnsureCapacityArrayNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/fixnum/FixnumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jcodings.specific.USASCIIEncoding;
import org.jruby.truffle.nodes.RubyNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
Loading