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

Commits on Feb 6, 2016

  1. [Truffle] Mark the pack nodes as internal root nodes.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    162e405 View commit details

  2. [Truffle] Tests for backtraces with pack in them.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    c175d53 View commit details
5 changes: 5 additions & 0 deletions test/truffle/integration/backtraces/pack.backtrace
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/pack.rb:13:in `to_str'
/pack.rb:18:in `pack'
/pack.rb:18:in `block in <main>'
/backtraces.rb:17:in `check'
/pack.rb:17:in `<main>'
19 changes: 19 additions & 0 deletions test/truffle/integration/backtraces/pack.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

require_relative 'backtraces'

class Test
def to_str
raise 'message'
end
end

check('pack.backtrace') do
[Test.new].pack('a')
end
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackRootNode.java
View file
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@
import org.jruby.truffle.core.format.runtime.PackResult;
import org.jruby.truffle.RubyLanguage;
import org.jruby.truffle.core.rope.CodeRange;
import org.jruby.truffle.language.InternalRootNode;
import org.jruby.util.StringSupport;

/**
* The node at the root of a pack expression.
*/
public class PackRootNode extends RootNode {
public class PackRootNode extends RootNode implements InternalRootNode {

private final String description;
private final PackEncoding encoding;
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/UnpackRootNode.java
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,9 @@
import org.jruby.truffle.RubyLanguage;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.rope.CodeRange;
import org.jruby.truffle.language.InternalRootNode;

public class UnpackRootNode extends RootNode {
public class UnpackRootNode extends RootNode implements InternalRootNode {

private final String description;
private final PackEncoding encoding;