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

Commits on Jun 27, 2016

  1. Copy the full SHA
    b6edbcd View commit details
  2. Copy the full SHA
    3193743 View commit details
  3. Copy the full SHA
    b4d68d3 View commit details
  4. [Truffle] New tags.

    eregon committed Jun 27, 2016
    Copy the full SHA
    81ba519 View commit details
2 changes: 2 additions & 0 deletions spec/ruby/core/range/shared/equal_value.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require File.expand_path('../../fixtures/classes', __FILE__)

describe :range_eql, shared: true do
it "returns true if other has same begin, end, and exclude_end? values" do
(0..2).send(@method, 0..2).should == true
1 change: 1 addition & 0 deletions spec/truffle/tags/core/fiber/resume_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Fiber#resume executes the ensure clause
1 change: 1 addition & 0 deletions spec/truffle/tags/core/range/eql_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Range#eql? returns false if the endpoints are not eql?
1 change: 1 addition & 0 deletions spec/truffle/tags/library/fiber/transfer_tags.txt
Original file line number Diff line number Diff line change
@@ -13,3 +13,4 @@ fails:Fiber#transfer transfers control from one Fiber to another when called fro
fails:Fiber#transfer can be invoked from the same Fiber it transfers control to
fails:Fiber#transfer can transfer control to a Fiber that has transfered to another Fiber
fails:Fiber#transfer raises a FiberError when transferring to a Fiber which resumes itself
fails:Fiber#transfer returns to the root Fiber when finished
15 changes: 13 additions & 2 deletions spec/truffle/truffle.mspec
Original file line number Diff line number Diff line change
@@ -10,10 +10,21 @@ class MSpecScript
RbConfig::CONFIG['host_os'] == 'linux'
end

set :target, File.expand_path("../../../bin/jruby#{windows? ? '.bat' : ''}", __FILE__)
JRUBY_DIR = File.expand_path('../../..', __FILE__)

set :target, "#{JRUBY_DIR}/bin/jruby#{windows? ? '.bat' : ''}"

if ARGV[-2..-1] != %w[-t ruby] # No flags for MRI
set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G -Xtruffle.graal.warn_unless=false]
flags = %w[
-X+T
-J-ea
-J-esa
-J-Xmx2G
-Xtruffle.graal.warn_unless=false
]
core_path = "#{JRUBY_DIR}/truffle/src/main/ruby"
flags << "-Xtruffle.core.load_path=#{core_path}" if File.directory?(core_path)
set :flags, flags
end

set :capi, [
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.backtrace.Backtrace;
import org.jruby.truffle.language.backtrace.BacktraceFormatter;

import org.jruby.truffle.language.backtrace.BacktraceFormatter.FormattingFlags;
import java.util.EnumSet;
import java.util.List;

public abstract class ExceptionOperations {

private static final EnumSet<BacktraceFormatter.FormattingFlags> FORMAT_FLAGS = EnumSet.of(
BacktraceFormatter.FormattingFlags.OMIT_FROM_PREFIX,
BacktraceFormatter.FormattingFlags.OMIT_EXCEPTION);
FormattingFlags.OMIT_FROM_PREFIX,
FormattingFlags.OMIT_EXCEPTION);

@TruffleBoundary
public static DynamicObject backtraceAsRubyStringArray(RubyContext context, DynamicObject exception, Backtrace backtrace) {