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

Commits on Jul 28, 2015

  1. Copy the full SHA
    d0015a5 View commit details
  2. Copy the full SHA
    80d9f19 View commit details
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;

import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.ModuleNodes;
@@ -30,6 +31,11 @@
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyModule;

/**
* Caches {@link ModuleOperations#lookupConstant}
* and checks visibility.
* The {@link LexicalScope} is constant here.
*/
@NodeChildren({ @NodeChild("module"), @NodeChild("name") })
public abstract class LookupConstantNode extends RubyNode {

Original file line number Diff line number Diff line change
@@ -15,12 +15,16 @@
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.ModuleOperations;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.methods.InternalMethod;

/**
* Caches {@link ModuleOperations#canBindMethodTo} for a method.
*/
@NodeChildren({
@NodeChild("method"),
@NodeChild("module")
Original file line number Diff line number Diff line change
@@ -26,10 +26,11 @@
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.methods.InternalMethod;

@NodeChildren({
@NodeChild("self"),
@NodeChild("name")
})
/**
* Caches {@link ModuleOperations#lookupMethod(RubyBasicObject, String)}
* on an actual instance.
*/
@NodeChildren({ @NodeChild("self"), @NodeChild("name") })
public abstract class LookupMethodNode extends RubyNode {

@Child MetaClassNode metaClassNode;
Original file line number Diff line number Diff line change
@@ -15,6 +15,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.ModuleNodes;
@@ -26,6 +27,10 @@
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.methods.InternalMethod;

/**
* Caches {@link ModuleOperations#lookupSuperMethod}
* on an actual instance.
*/
@NodeChild("self")
public abstract class LookupSuperMethodNode extends RubyNode {

Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public static Object[] extractUserArguments(Object[] arguments) {
}

public static Object[] extractUserArgumentsWithUnshift(Object first, Object[] arguments) {
final Object[] range = ArrayUtils.extractRange(arguments, BLOCK_INDEX, arguments.length);
final Object[] range = ArrayUtils.extractRange(arguments, RUNTIME_ARGUMENT_COUNT - 1, arguments.length);
range[0] = first;
return range;
}