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: 6e934143e571
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e7477024503
Choose a head ref
  • 4 commits
  • 83 files changed
  • 1 contributor

Commits on May 9, 2015

  1. [Truffle] Further simplify the entry point.

    @chrisseaton
    chrisseaton committed May 9, 2015
    Copy the full SHA
    da3678a View commit details

  2. [Truffle] Move some nodes around.

    @chrisseaton
    chrisseaton committed May 9, 2015
    Copy the full SHA
    fd6f624 View commit details

  3. [Truffle] Move some more nodes around.

    @chrisseaton
    chrisseaton committed May 9, 2015
    Copy the full SHA
    038dec7 View commit details

  4. [Truffle] Use NilLiteralNode where possible.

    @chrisseaton
    chrisseaton committed May 9, 2015
    Copy the full SHA
    4e74770 View commit details
Showing with 170 additions and 163 deletions.
  1. +1 −2 core/src/main/java/org/jruby/Main.java
  2. +14 −13 core/src/main/java/org/jruby/Ruby.java
  3. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/CheckArityNode.java
  5. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/IsNilNode.java
  6. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/MissingArgumentBehaviour.java
  7. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/MissingKeywordArgumentNode.java
  8. +1 −1 ...e/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/OptionalKeywordArgMissingNode.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadAllArgumentsNode.java
  10. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadBlockNode.java
  11. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadKeywordArgumentNode.java
  12. +2 −2 ...fle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadKeywordRestArgumentNode.java
  13. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadOptionalArgumentNode.java
  14. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadPostArgumentNode.java
  15. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadPreArgumentNode.java
  16. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ReadRestArgumentNode.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/ShouldDestructureNode.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/arguments/UnknownArgumentErrorNode.java
  19. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
  20. +2 −1 truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
  21. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
  22. +2 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
  23. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  24. +1 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  25. +2 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  26. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/AppendOneNode.java
  27. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayAllocationSite.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayBuilderNode.java
  29. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayConcatNode.java
  30. +2 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayCoreMethodNode.java
  31. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayDropTailNode.java
  32. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayDupNode.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayGetTailNode.java
  34. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArrayGuards.java
  35. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{literal → core/array}/ArrayLiteralNode.java
  36. +6 −5 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}/ArrayPushNode.java
  38. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayReadDenormalizedNode.java
  39. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayReadNormalizedNode.java
  40. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayReadSliceDenormalizedNode.java
  41. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayReadSliceNormalizedNode.java
  42. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → array}/ArraySliceNode.java
  43. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayWriteDenormalizedNode.java
  44. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/ArrayWriteNormalizedNode.java
  45. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/EnsureCapacityArrayNode.java
  46. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/GeneralizeArrayNode.java
  47. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/NewFixnumLowerNode.java
  48. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/array/PrimitiveArrayNodeFactory.java
  49. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{literal → core/fixnum}/FixnumLiteralNode.java
  50. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → fixnum}/FixnumLowerNode.java
  51. +2 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → fixnum}/FixnumNodes.java
  52. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{literal → core/hash}/ConcatHashLiteralNode.java
  53. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/hash/FindEntryNode.java
  54. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{literal → core/hash}/HashLiteralNode.java
  55. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{ → core}/hash/HashNode.java
  56. +4 −5 truffle/src/main/java/org/jruby/truffle/nodes/core/{ → hash}/HashNodes.java
  57. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/EnsureNode.java
  58. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/RescueAnyNode.java
  59. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/RescueClassesNode.java
  60. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/RescueNode.java
  61. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/RescueSplatNode.java
  62. +4 −2 truffle/src/main/java/org/jruby/truffle/nodes/{control → exceptions}/TryNode.java
  63. +1 −3 truffle/src/main/java/org/jruby/truffle/nodes/{control → locals}/FlipFlopNode.java
  64. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/FlipFlopStateNode.java
  65. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/FrameSlotNode.java
  66. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/InitFlipFlopSlotNode.java
  67. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/LevelFlipFlopStateNode.java
  68. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/LocalFlipFlopStateNode.java
  69. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/ReadAbstractFrameSlotNode.java
  70. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/ReadLevelVariableNode.java
  71. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/ReadLocalVariableNode.java
  72. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/WriteAbstractFrameSlotNode.java
  73. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/WriteLevelVariableNode.java
  74. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/{methods → }/locals/WriteLocalVariableNode.java
  75. +2 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java
  76. +4 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  77. +1 −2 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java
  78. +29 −23 truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  79. +6 −6 truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
  80. +9 −8 truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
  81. +2 −1 truffle/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java
  82. +2 −1 truffle/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
  83. +2 −2 truffle/src/main/java/org/jruby/truffle/translator/TranslatorEnvironment.java
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/Main.java
View file
Original file line number Diff line number Diff line change
@@ -400,8 +400,7 @@ private Status doRunFromMain(Ruby runtime, InputStream in, String filename) {

runtime.runFromMain(in, filename);

runtime.shutdownTruffleContext();

runtime.shutdownTruffleContextIfRunning();
} catch (RaiseException rj) {
return new Status(handleRaiseException(rj));
}
27 changes: 14 additions & 13 deletions core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -823,6 +823,10 @@ public IRubyObject runScript(Script script) {
}

public IRubyObject runScript(Script script, boolean wrap) {
if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
throw new UnsupportedOperationException();
}

ThreadContext context = getCurrentContext();

try {
@@ -847,18 +851,15 @@ public IRubyObject runScriptBody(Script script) {
}

public IRubyObject runInterpreter(ThreadContext context, ParseResult parseResult, IRubyObject self) {
if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
assert parseResult instanceof RootNode;
assert self == getTopSelf();
getTruffleContext().execute((RootNode) parseResult);
return getNil();
} else {
try {
return Interpreter.getInstance().execute(this, parseResult, self);
} catch (JumpException.ReturnJump rj) {
return (IRubyObject) rj.getValue();
}
}
if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
throw new UnsupportedOperationException();
}

try {
return Interpreter.getInstance().execute(this, parseResult, self);
} catch (JumpException.ReturnJump rj) {
return (IRubyObject) rj.getValue();
}
}

public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObject self) {
@@ -941,7 +942,7 @@ private TruffleContextInterface loadTruffleContext() {
return truffleBridge;
}

public void shutdownTruffleContext() {
public void shutdownTruffleContextIfRunning() {
synchronized (truffleContextMonitor) {
if (truffleContext != null) {
truffleContext.shutdown();
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@
import org.jruby.truffle.nodes.cast.ProcOrNullNode;
import org.jruby.truffle.nodes.cast.ProcOrNullNodeGen;
import org.jruby.truffle.nodes.dispatch.*;
import org.jruby.truffle.nodes.literal.HashLiteralNode;
import org.jruby.truffle.nodes.core.hash.HashLiteralNode;
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
import org.jruby.truffle.nodes.methods.MarkerNode;
import org.jruby.truffle.nodes.methods.arguments.OptionalKeywordArgMissingNode;
import org.jruby.truffle.nodes.methods.arguments.UnknownArgumentErrorNode;
import org.jruby.truffle.nodes.arguments.OptionalKeywordArgMissingNode;
import org.jruby.truffle.nodes.arguments.UnknownArgumentErrorNode;
import org.jruby.truffle.runtime.ModuleOperations;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion ...des/methods/arguments/CheckArityNode.java → ...uffle/nodes/arguments/CheckArityNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
3 changes: 1 addition & 2 deletions ...le/nodes/methods/arguments/IsNilNode.java → ...by/truffle/nodes/arguments/IsNilNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

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.RubyContext;
import org.jruby.truffle.runtime.core.RubyNilClass;

public class IsNilNode extends RubyNode {

2 changes: 1 addition & 1 deletion ...s/arguments/MissingArgumentBehaviour.java → ...s/arguments/MissingArgumentBehaviour.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

public enum MissingArgumentBehaviour {
RUNTIME_ERROR, UNDEFINED, NIL;
2 changes: 1 addition & 1 deletion ...arguments/MissingKeywordArgumentNode.java → ...arguments/MissingKeywordArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
2 changes: 1 addition & 1 deletion ...uments/OptionalKeywordArgMissingNode.java → ...uments/OptionalKeywordArgMissingNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...thods/arguments/ReadAllArgumentsNode.java → ...nodes/arguments/ReadAllArgumentsNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...odes/methods/arguments/ReadBlockNode.java → ...ruffle/nodes/arguments/ReadBlockNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...ds/arguments/ReadKeywordArgumentNode.java → ...es/arguments/ReadKeywordArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
4 changes: 2 additions & 2 deletions ...rguments/ReadKeywordRestArgumentNode.java → ...rguments/ReadKeywordRestArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.literal.HashLiteralNode;
import org.jruby.truffle.nodes.core.hash.HashLiteralNode;
import org.jruby.truffle.nodes.methods.MarkerNode;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
2 changes: 1 addition & 1 deletion ...s/arguments/ReadOptionalArgumentNode.java → ...s/arguments/ReadOptionalArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...thods/arguments/ReadPostArgumentNode.java → ...nodes/arguments/ReadPostArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...ethods/arguments/ReadPreArgumentNode.java → .../nodes/arguments/ReadPreArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...thods/arguments/ReadRestArgumentNode.java → ...nodes/arguments/ReadRestArgumentNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...hods/arguments/ShouldDestructureNode.java → ...odes/arguments/ShouldDestructureNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
2 changes: 1 addition & 1 deletion ...s/arguments/UnknownArgumentErrorNode.java → ...s/arguments/UnknownArgumentErrorNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.methods.arguments;
package org.jruby.truffle.nodes.arguments;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.ArrayDupNode;
import org.jruby.truffle.nodes.core.ArrayDupNodeGen;
import org.jruby.truffle.nodes.core.array.ArrayDupNode;
import org.jruby.truffle.nodes.core.array.ArrayDupNodeGen;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.dispatch.DispatchNode;
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.literal.NilLiteralNode;
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyNilClass;
@@ -39,7 +40,7 @@ public static RubyNode sequence(RubyContext context, SourceSection sourceSection
final List<RubyNode> flattened = flatten(sequence, true);

if (flattened.isEmpty()) {
return new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject());
return new NilLiteralNode(context, sourceSection);
} else if (flattened.size() == 1) {
return flattened.get(0);
} else {
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -19,10 +19,10 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.globals.GetFromThreadLocalNode;
import org.jruby.truffle.nodes.globals.WrapInThreadLocalNode;
import org.jruby.truffle.nodes.methods.locals.ReadAbstractFrameSlotNode;
import org.jruby.truffle.nodes.methods.locals.ReadAbstractFrameSlotNodeGen;
import org.jruby.truffle.nodes.methods.locals.WriteAbstractFrameSlotNode;
import org.jruby.truffle.nodes.methods.locals.WriteAbstractFrameSlotNodeGen;
import org.jruby.truffle.nodes.locals.ReadAbstractFrameSlotNode;
import org.jruby.truffle.nodes.locals.ReadAbstractFrameSlotNodeGen;
import org.jruby.truffle.nodes.locals.WriteAbstractFrameSlotNode;
import org.jruby.truffle.nodes.locals.WriteAbstractFrameSlotNodeGen;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
3 changes: 2 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
@@ -19,8 +19,9 @@
import org.jruby.truffle.nodes.RubyRootNode;
import org.jruby.truffle.nodes.cast.TaintResultNode;
import org.jruby.truffle.nodes.control.SequenceNode;
import org.jruby.truffle.nodes.core.fixnum.FixnumLowerNode;
import org.jruby.truffle.nodes.methods.ExceptionTranslatingNode;
import org.jruby.truffle.nodes.methods.arguments.*;
import org.jruby.truffle.nodes.arguments.*;
import org.jruby.truffle.nodes.objects.SelfNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.control.TruffleFatalException;
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.MissingBehavior;
import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
import org.jruby.truffle.nodes.methods.arguments.CheckArityNode;
import org.jruby.truffle.nodes.methods.arguments.MissingArgumentBehaviour;
import org.jruby.truffle.nodes.methods.arguments.ReadPreArgumentNode;
import org.jruby.truffle.nodes.arguments.CheckArityNode;
import org.jruby.truffle.nodes.arguments.MissingArgumentBehaviour;
import org.jruby.truffle.nodes.arguments.ReadPreArgumentNode;
import org.jruby.truffle.nodes.objects.*;
import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
import org.jruby.truffle.runtime.*;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
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.core.array.ArrayBuilderNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.UndefinedPlaceholder;
import org.jruby.truffle.runtime.control.NextException;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,8 @@
import org.jruby.truffle.nodes.coerce.ToIntNodeGen;
import org.jruby.truffle.nodes.coerce.ToStrNode;
import org.jruby.truffle.nodes.coerce.ToStrNodeGen;
import org.jruby.truffle.nodes.core.array.ArrayCoreMethodNode;
import org.jruby.truffle.nodes.core.fixnum.FixnumLowerNode;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.objects.IsFrozenNode;
3 changes: 1 addition & 2 deletions ...by/truffle/nodes/array/AppendOneNode.java → ...uffle/nodes/core/array/AppendOneNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.array;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.ArrayGuards;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.util.ArrayUtils;
2 changes: 1 addition & 1 deletion ...uffle/nodes/core/ArrayAllocationSite.java → ...nodes/core/array/ArrayAllocationSite.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.Assumption;
import com.oracle.truffle.api.CompilerDirectives;
2 changes: 1 addition & 1 deletion .../truffle/nodes/core/ArrayBuilderNode.java → ...le/nodes/core/array/ArrayBuilderNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.nodes.Node;
2 changes: 1 addition & 1 deletion ...y/truffle/nodes/core/ArrayConcatNode.java → ...fle/nodes/core/array/ArrayConcatNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.ExplodeLoop;
3 changes: 2 additions & 1 deletion ...uffle/nodes/core/ArrayCoreMethodNode.java → ...nodes/core/array/ArrayCoreMethodNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.dsl.ImportStatic;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.runtime.RubyContext;

@ImportStatic(ArrayGuards.class)
2 changes: 1 addition & 1 deletion ...truffle/nodes/core/ArrayDropTailNode.java → ...e/nodes/core/array/ArrayDropTailNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.ImportStatic;
2 changes: 1 addition & 1 deletion ...ruby/truffle/nodes/core/ArrayDupNode.java → ...ruffle/nodes/core/array/ArrayDupNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.dsl.ImportStatic;
import com.oracle.truffle.api.dsl.NodeChild;
2 changes: 1 addition & 1 deletion .../truffle/nodes/core/ArrayGetTailNode.java → ...le/nodes/core/array/ArrayGetTailNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.ImportStatic;
2 changes: 1 addition & 1 deletion ...jruby/truffle/nodes/core/ArrayGuards.java → ...truffle/nodes/core/array/ArrayGuards.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.core;
package org.jruby.truffle.nodes.core.array;

import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyRange;
Loading