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

Commits on Jan 11, 2017

  1. Copy the full SHA
    333421c View commit details
  2. Copy the full SHA
    e22ed14 View commit details
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.core.array.ArrayStrategy;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.LazyRubyNode;
import org.jruby.truffle.language.backtrace.Backtrace;
import org.jruby.truffle.language.backtrace.BacktraceFormatter;
import org.jruby.truffle.language.methods.InternalMethod;
@@ -210,4 +211,16 @@ public boolean isShared(DynamicObject object) {

}

@CoreMethod(names = "resolve_lazy_nodes", onSingleton = true)
public abstract static class ResolveLazyNodesNode extends CoreMethodArrayArgumentsNode {

@TruffleBoundary
@Specialization
public DynamicObject resolveLazyNodes() {
LazyRubyNode.resolveAll(getContext());
return nil();
}

}

}
Original file line number Diff line number Diff line change
@@ -99,6 +99,7 @@ public void testBreakpoint() throws Throwable {
// Init before eval:
performWork();
engine.eval(factorial);
engine.eval(Source.newBuilder("Truffle::Debug.resolve_lazy_nodes").mimeType(RubyLanguage.MIME_TYPE).name("resolve_lazy_nodes").build());

assertExecutedOK("Algorithm loaded");

@@ -123,6 +124,7 @@ public void testBreakpoint() throws Throwable {
public void stepInStepOver() throws Throwable {
final Source factorial = createFactorial();
engine.eval(factorial);
engine.eval(Source.newBuilder("Truffle::Debug.resolve_lazy_nodes").mimeType(RubyLanguage.MIME_TYPE).name("resolve_lazy_nodes").build());
run.addLast(() -> {
assertNull(suspendedEvent);
assertNotNull(debuggerSession);
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ protected synchronized PolyglotEngine prepareVM() throws Exception {
protected PolyglotEngine prepareVM(PolyglotEngine.Builder preparedBuilder) throws Exception {
final PolyglotEngine engine = preparedBuilder.build();
engine.eval(getSource("src/test/ruby/tck.rb"));
engine.eval(Source.newBuilder("Truffle::Debug.resolve_lazy_nodes").mimeType(RubyLanguage.MIME_TYPE).name("resolve_lazy_nodes").build());
return engine;
}