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

Commits on May 14, 2016

  1. [Truffle] Remove debug code.

    @chrisseaton
    chrisseaton committed May 14, 2016
    Copy the full SHA
    16f9389 View commit details

  2. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed May 14, 2016
    Copy the full SHA
    12fa3c9 View commit details

Commits on May 16, 2016

  1. Merge branch 'master' into truffle-head 

    # Conflicts:
#	.travis.yml
    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    4ceccbd View commit details

  2. [Truffle] Fix bad merge.

    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    634a6a6 View commit details

  3. Reenable did_you_mean and add to preinstalled gems.

    @headius
    headius committed May 16, 2016
    Copy the full SHA
    f18ec2d View commit details

  4. Clear out RubyGems paths so we can reinitialize them.

    @headius
    headius committed May 16, 2016
    Copy the full SHA
    90eabde View commit details

  5. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    f7d805a View commit details

  6. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    edbd334 View commit details

  7. [Truffle] Use latest graal-core.

    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    c6a062e View commit details

  8. Merge branch 'master' into truffle-head 

    # Conflicts:
#	ci.hocon
    @chrisseaton
    chrisseaton committed May 16, 2016
    Copy the full SHA
    8597c4e View commit details

Commits on May 17, 2016

  1. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed May 17, 2016
    Copy the full SHA
    edba9cc View commit details

Commits on May 18, 2016

  1. Revert "[Truffle] Debugging failed integration test on Travis." 

    This reverts commit 15da921.
    @nirvdrum
    nirvdrum committed May 18, 2016
    Copy the full SHA
    a9ea20c View commit details

  2. [Truffle] We do want GRAAL_JS_JAR for test integration.

    @chrisseaton
    chrisseaton committed May 18, 2016
    Copy the full SHA
    c9145b8 View commit details

  3. [Truffle] JS integration and exported inline tests.

    @chrisseaton
    chrisseaton committed May 18, 2016
    Copy the full SHA
    7ee1b4b View commit details

  4. [Truffle] jt support for SL.

    @chrisseaton
    chrisseaton committed May 18, 2016
    Copy the full SHA
    7f0e734 View commit details

  5. [Truffle] Add SL integration tests.

    @chrisseaton
    chrisseaton committed May 18, 2016
    Copy the full SHA
    9cd2ccc View commit details

  6. [Truffle] No transfers in VMPrimitiveNodes

    @eregon
    eregon committed May 18, 2016
    Copy the full SHA
    a53e82f View commit details

  7. [Truffle] Remove transfers in BasicObjectNodes.

    @eregon
    eregon committed May 18, 2016
    Copy the full SHA
    2f8c7e7 View commit details

  8. [Truffle] Let the PE see the throw in method_missing.

    @eregon
    eregon committed May 18, 2016
    Copy the full SHA
    2826c73 View commit details

  9. [Truffle] RopeOperations.create should be boundary.

    @eregon
    eregon committed May 18, 2016
    4
    Copy the full SHA
    ea3b122 View commit details

  10. [Truffle] Contain cached case in uncached one for is_a?.

    @eregon
    eregon committed May 18, 2016
    Copy the full SHA
    629cbd3 View commit details

  11. [Truffle] Joda-Time stuff should be boundary.

    @eregon
    eregon committed May 18, 2016
    Copy the full SHA
    5d22b02 View commit details

  12. JRuby incorrectly dispatches const_missing; tag failure. #3903

    @headius
    headius committed May 18, 2016
    Copy the full SHA
    5078c40 View commit details

  13. [Truffle] do not keep ReentrantLocks around when there are no more th… 

    …reads waiting
    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    db39ee7 View commit details

  14. [Truffle] improve comment wording

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    ed1988d View commit details

  15. [Truffle] Formatting

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    aa637cc View commit details

  16. [Truffle] extract KeyedReentrantLock from FeatureLoader

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    6ceff1c View commit details

  17. [Truffle] simplify KeyedReentrantLock API

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    0b88148 View commit details

  18. [Truffle] Formatting

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    0fc21ee View commit details

  19. [Truffle] better argument naming

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    899bc6f View commit details

  20. [Truffle] rename KeyedReentrantLock -> ReentrantLockFreeingMap

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    0dfee5f View commit details

  21. [Truffle] fix map for reverted Fixnum ranges

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    3b4fe3e View commit details

  22. [Truffle] Formatting

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    143b725 View commit details

  23. [Truffle] do not drop backtrace in expression rescue $!

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    98d92fc View commit details

  24. [Truffle] use Truffle DSL in DefineModuleNode

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    10aa949 View commit details

  25. [Truffle] Use cached value instead of argument value in guards 

    when referential equality of the argument value and its cached value is guarded
    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    6a663c1 View commit details

  26. [Truffle] distinguish which isRubyModel check is used

    @pitr-ch
    pitr-ch committed May 18, 2016
    Copy the full SHA
    455fce1 View commit details

  27. Rewrite recursive guard and wire it up. 

    The old recursion guard (ported from MRI years ago) had a number
of flaws:

* It forced an object ID for every object encountered.
* It created transient objects for every recursive stack.
* It was not using identity hashing (#3887).
* It used a RubyHash internally, which has much more overhead than
  a typical JDK Map.

The new implementation largely follows the pattern of the original
but fixes all the above items. It passes all untagged specs.

See also #3884, which started this whole thing.
    @headius
    headius committed May 18, 2016
    Copy the full SHA
    dc7c489 View commit details

  28. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed May 18, 2016
    Copy the full SHA
    279e0bd View commit details

Commits on May 19, 2016

  1. Skip JRuby+Truffle TCK unless -Ptest.

    @headius
    headius committed May 19, 2016
    Copy the full SHA
    15b34cc View commit details

  2. Provide jruby.home to Surefire to get a proper home.

    @headius
    headius committed May 19, 2016
    Copy the full SHA
    d706786 View commit details

  3. [Truffle] Normalize transfer before insert() to not invalidate. 

    * insert() will invalidate.
    @eregon
    eregon committed May 19, 2016
    Copy the full SHA
    534cb71 View commit details

  4. [Truffle] Remove most of transferToInterpreter.

    @eregon
    eregon committed May 19, 2016
    Copy the full SHA
    1a7e030 View commit details

  5. Update for release

    @enebo
    enebo committed May 19, 2016
    Copy the full SHA
    fe84e89 View commit details

  6. [Truffle] Fixed running on Graal when assertions are enabled.

    @nirvdrum
    nirvdrum committed May 19, 2016
    Copy the full SHA
    70d4d3a View commit details

  7. [Truffle] Added support for running the optional C API specs.

    @nirvdrum
    nirvdrum committed May 19, 2016
    Copy the full SHA
    6302e6b View commit details

  8. [Truffle] Allow absolute output paths for jruby-cext-c.

    @nirvdrum
    nirvdrum committed May 19, 2016
    7
    Copy the full SHA
    cc08c24 View commit details

  9. [Truffle] Store the .ll files in the output rather than source direct… 

    …ory.

This is a bit subjective, but generally we version control the source directory and not the output directory. This just keeps the source directory a bit cleaner.
    @nirvdrum
    nirvdrum committed May 19, 2016
    Copy the full SHA
    cebd56a View commit details

  10. [Truffle] Added more defines to get the C API specs compiling.

    @nirvdrum
    nirvdrum committed May 19, 2016
    Copy the full SHA
    b37801d View commit details

  11. Add support for compiling & testing optional C API specs on JRuby+Tru… 

    …ffle.
    @nirvdrum
    nirvdrum committed May 19, 2016
    4
    Copy the full SHA
    e097322 View commit details
Showing 2,523 changed files with 66,208 additions and 157,825 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ lib/ruby/gems
lib/ruby/stdlib/*jopenssl*.jar
lib/ruby/stdlib/bcpkix-jdk15on-*.jar
lib/ruby/stdlib/bcprov-jdk15on-*.jar
lib/ruby/stdlib/did_you_mean*
lib/ruby/stdlib/gauntlet_rdoc.rb
lib/ruby/stdlib/jar*
lib/ruby/stdlib/jline
39 changes: 21 additions & 18 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -84,16 +84,33 @@ matrix:
jdk: oraclejdk8
- env: JT='test integration'
jdk: oraclejdk8
- env: JT='test gems' JAVA_OPTS="$JAVA_OPTS -Xmx512m" HAS_REDIS=true
- env:
- COMMAND=test/truffle/gems/install-gems.sh
- JT='test gems'
jdk: oraclejdk8
- env:
- JAVA_OPTS="$JAVA_OPTS -Xmx512m"
- HAS_REDIS=true
- COMMAND=test/truffle/ecosystem-travis-install.sh
- JT='test ecosystem'
jdk: oraclejdk8
- env: JT='test tck'
jdk: oraclejdk8
- env: JT=check_ambiguous_arguments SKIP_BUILD=true
- env:
- JT=check_ambiguous_arguments
- SKIP_BUILD=true
jdk: oraclejdk8
- env:
- USE_BUILD_PACK=yes
- JT='test fast'
jdk: oraclejdk8
- env: JT='test mri'
jdk: oraclejdk8
allow_failures:
- env: PHASE='-Prake -Dtask=test:mri:fullint'
- env: JT='test mri'
jdk: oraclejdk8
- env: JT='test gems' JAVA_OPTS="$JAVA_OPTS -Xmx512m" HAS_REDIS=true
- env: PHASE='-Pj2ee'
jdk: oraclejdk7
# NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
@@ -103,22 +120,8 @@ matrix:
# group: edge
# jdk: oraclejdk9

branches:
only:
- master
- jruby-1_7
- truffle-head
- /^test-.*$/
- /^ha-feature/
- ruby-2.4

script: tool/travis_runner.sh
install: |
if [[ -n "$PHASE" && $JAVA_HOME == *"java-8"* ]]; then
travis_retry ./mvnw package -B --projects '!truffle' -Dinvoker.skip -Dmaven.test.skip;
else
if [ -z "$SKIP_BUILD" ]; then travis_retry ./mvnw package -B -Dinvoker.skip -Dmaven.test.skip; fi
fi
install: tool/travis-install.sh
script: tool/travis-script.sh

notifications:
irc:
Loading