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
base: 62c76ac68d63
Choose a base ref
...
head repository: jruby/jruby
compare: bd7e5b07d7b8
Choose a head ref
  • 12 commits
  • 125 files changed
  • 2 contributors

Commits on Mar 14, 2015

  1. [Truffle] Import stringio from RubySL.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    e09e135 View commit details
    Browse the repository at this point in the history

  2. [Truffle] String#byte_append.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    cf89fd2 View commit details
    Browse the repository at this point in the history

  3. [Truffle] String#num_bytes= and primitive :string_resize_capacity

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    11
    Copy the full SHA
    4feca49 View commit details
    Browse the repository at this point in the history

  4. [Truffle] Refactoring Array#+ to handle more cases and adding #to_ary

    @bjfish
    bjfish committed Mar 14, 2015
    Copy the full SHA
    4260ce0 View commit details
    Browse the repository at this point in the history

  5. [Truffle] TaintResultNode has to be able to handle arguments that wer… 

    …en't full objects.
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    3
    Copy the full SHA
    ffb5b80 View commit details
    Browse the repository at this point in the history

  6. [Truffle] String#<<(Fixnum)

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    ba3219a View commit details
    Browse the repository at this point in the history

  7. [Truffle] Tag failing stringio spec.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    1d72dee View commit details
    Browse the repository at this point in the history

  8. [Truffle] Some IO constants.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    6edb3ab View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2702 from bjfish/truffle_array_plus_refactoring 

    [Truffle] Refactoring Array#+ to handle more cases and adding #to_ary
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    8ce42e4 View commit details
    Browse the repository at this point in the history

  10. Revert "[Truffle] Make notDesignedForCompilation use bailout rather t… 

    …han an assert."

This reverts commit a19cd4a.
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    143279b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into truffle-head 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
	truffle/src/main/ruby/core/shims.rb
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    d80b601 View commit details
    Browse the repository at this point in the history

  12. [Truffle] Update for the new instrument API.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    bd7e5b0 View commit details
    Browse the repository at this point in the history