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: aed863adfd95
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fcc8afc9e817
Choose a head ref
7 contributors

Commits on Jan 28, 2015

  1. [Truffle] Update File constants to match MRI and non-Truffle JRuby.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    5fc0fd5 View commit details

  2. [Truffle] Some updates to RbConfig::CONFIG. 

    The keys must be Strings, not Symbols.  I've also added some common keys used by other implementations.  Finally, the OS will identify as Win32 on Windows, which activates a bunch of Windows-specific logic in RubySpec.
    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    c73f8e2 View commit details

  3. [Truffle] Apparently reporting the version number broke some specs.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    62c5247 View commit details

  4. [Truffle] Separate class loading from initialization.

    @eregon
    eregon committed Jan 28, 2015
    Copy the full SHA
    1a7f688 View commit details

  5. [Truffle] Refactor and fix SafepointManager. 

    * New design so assumptionInvalidated() drives all barrier synchronizations.
* The global lock is now better separated from barrier synchronization.
* Support interrupts of the barrier by re-creating it (should be relatively rare).
    @eregon
    eregon committed Jan 28, 2015
    Copy the full SHA
    973a03f View commit details

  6. [Truffle] Tag ARGF specs failing on windows 

    * Done with:
  $ ruby spec/mspec/bin/mspec tag --unguarded --all --add fails -B spec/truffle/truffle.mspec spec/ruby/core/argf -Z
    @eregon
    eregon committed Jan 28, 2015
    Copy the full SHA
    c06d6f5 View commit details

  7. [Truffle] Tag a slow spec as such. 

    * Takes 8s alone!
    @eregon
    eregon committed Jan 28, 2015
    Copy the full SHA
    c15b6e9 View commit details

  8. Move #itself from BasicObject to Object

    @sferik
    sferik committed Jan 28, 2015
    Copy the full SHA
    c2184b5 View commit details

  9. Move #object_id method from BasicObject to Object

    @sferik
    sferik committed Jan 28, 2015
    Copy the full SHA
    519fd75 View commit details

  10. Remove deprecated Object#id method (removed in Ruby 1.9.3)

    @sferik
    sferik committed Jan 28, 2015
    Copy the full SHA
    0ce0215 View commit details

  11. [Truffle] Fix null FrameSlot when kwarg is not used 

    When a keyword argument is not used in the method body there is no frame
slot for the argument resulting a NullPointerException when writing the
argument to the frame.

This fix changes the AST translator to create the frame slot if it
cannot be found by using `findOrAddFrameSlot` instead of
`findFrameSlot`.
    @jgraichen
    jgraichen committed Jan 28, 2015
    Copy the full SHA
    f362d70 View commit details

  12. Merge pull request #2535 from jgraichen/unused-kwarg 

    [Truffle] Fix null FrameSlot when kwarg is not used
    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    47f9a70 View commit details

  13. Merge pull request #2520 from sferik/move_methods_to_object 

    Move methods from BasicObject to Object
    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    a003621 View commit details

  14. [Truffle] Flatten the AST at new lines [pass, trace, child], not [pas… 

    …s, (trace child)]
    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    effa2bc View commit details

  15. Fixes #2528. RegexpError: invalid multibyte character

    @enebo
    enebo committed Jan 28, 2015
    Copy the full SHA
    331bae6 View commit details

  16. Move #itself and #object_id from Object to Kernel

    @sferik
    sferik committed Jan 28, 2015
    Copy the full SHA
    5040d48 View commit details

  17. [Truffle] Handle directory globbing without any '*' in the pattern.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    9ccac8b View commit details

  18. Merge pull request #2536 from sferik/move_object_methods_to_kernel 

    Move #itself and #object_id from Object to Kernel
    @headius
    headius committed Jan 28, 2015
    Copy the full SHA
    8e86650 View commit details

  19. [Truffle] Tagged a bunch of failing Windows-specific specs.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    c8a63b3 View commit details

  20. [Truffle] Tagged specs that pass on not-Windows but fail on Windows.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    01944cc View commit details

  21. [Truffle] Truffle::Debug.source_attribution_tree

    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    f804129 View commit details

  22. [Truffle] Remove debug info left in by mistake.

    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    376f155 View commit details

  23. [Truffle] Tagged more specs on Windows.

    @nirvdrum
    nirvdrum committed Jan 28, 2015
    Copy the full SHA
    9fb2a4d View commit details

  24. [Truffle] Truffle::Debug.source_attribution_tree

    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    54efaca View commit details

  25. [Truffle] Tag failing defined? spec.

    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    8af5002 View commit details

  26. Merge branch 'master' into truffle-head 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    b020190 View commit details

  27. [Truffle] Fix broken merge.

    @chrisseaton
    chrisseaton committed Jan 28, 2015
    Copy the full SHA
    fcc8afc View commit details
Loading