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

Commits on Nov 13, 2014

  1. [Truffle] Implement {Module,Class}#initialize and {class,module}_exec.

    * Unnamed modules should not have a lexical parent.
    eregon committed Nov 13, 2014
    Copy the full SHA
    89cea9c View commit details
  2. Copy the full SHA
    be8b9bb View commit details
  3. Copy the full SHA
    173a5bc View commit details
  4. Copy the full SHA
    ec8dfe8 View commit details
  5. [Truffle] Anonynous classes should have unset parent so the singleton…

    … class has the right parent.
    eregon committed Nov 13, 2014
    Copy the full SHA
    045b28a View commit details
  6. [Truffle] Add ModuleOperations.lookupSuperMethod.

    * And try to partially fix AbstractGeneralSuperCallNode.
    eregon committed Nov 13, 2014
    Copy the full SHA
    336e527 View commit details
  7. update testing commands

    tduehr committed Nov 13, 2014
    Copy the full SHA
    7bb59e0 View commit details
  8. Copy the full SHA
    5333427 View commit details
  9. Copy the full SHA
    c31ce4e View commit details
  10. Copy the full SHA
    2828c5c View commit details
  11. Copy the full SHA
    1ced631 View commit details
  12. [Truffle] Implement Regexp.new(regexp).

    * Copy and recompile to be sure to have no dependency for now.
    eregon committed Nov 13, 2014
    Copy the full SHA
    709b7b1 View commit details
  13. Copy the full SHA
    f648c7d View commit details
  14. Copy the full SHA
    688a3ad View commit details
  15. Merge pull request #2191 from tduehr/test_doc

    update testing commands
    enebo committed Nov 13, 2014
    Copy the full SHA
    a5bb1e3 View commit details
  16. Merge pull request #2192 from k77ch7/GH-2050_on_master

    Fix for issue 2050 on master: BigDecimal and nil multiplication
    enebo committed Nov 13, 2014
    Copy the full SHA
    e86c673 View commit details
  17. [Truffle] Move frozen status to BasicObject.

    * We can use methods of Kernel and bind them on BasicObject:
    
    > f = Kernel.instance_method :freeze
    => #<UnboundMethod: Kernel#freeze>
    > b=BasicObject.new
    => #<BasicObject:0x62e2d8>
    > is=Kernel.instance_method :frozen?
    => #<UnboundMethod: Kernel#frozen?>
    > is.bind(b).call
    => false
    > f.bind(b).call
    => #<BasicObject:0x47ef28>
    > is.bind(b).call
    => true
    eregon committed Nov 13, 2014
    Copy the full SHA
    a53584d View commit details
  18. [Truffle] Make RubyBasicObject.freeze private and propagate to single…

    …ton class.
    
    * Fix bad formatting in frozenError().
    eregon committed Nov 13, 2014
    Copy the full SHA
    fd49351 View commit details
  19. Copy the full SHA
    4ce6f73 View commit details
  20. Copy the full SHA
    997c325 View commit details
  21. Copy the full SHA
    be2e148 View commit details
  22. Copy the full SHA
    82b4959 View commit details
  23. isImplementedBy

    tduehr committed Nov 13, 2014
    Copy the full SHA
    2078209 View commit details
  24. Copy the full SHA
    fce2c10 View commit details
  25. remove prepend exclusions

    tduehr committed Nov 13, 2014
    Copy the full SHA
    fca95cc View commit details
  26. cleanup, pickup, put away

    clear out extra code and comments
    tduehr committed Nov 13, 2014
    Copy the full SHA
    f4fe220 View commit details

Commits on Nov 14, 2014

  1. Copy the full SHA
    c12cf66 View commit details
  2. StringBuilder should delegate toString to the underlying implementation.

    * Fixes output of bin/ast -s.
    eregon committed Nov 14, 2014
    Copy the full SHA
    a73722e View commit details
  3. Copy the full SHA
    252bd4e View commit details
  4. Copy the full SHA
    470b5ca View commit details
  5. [Truffle] Fix handling of the rest argument with post arguments.

    * Simplify too much indices computations by using negative indices.
    * Introduce an ArraySliceNode.
    eregon committed Nov 14, 2014
    Copy the full SHA
    a63029b View commit details
  6. [Truffle] Untag some new passing specs due to rest arg handling and b…

    …etter splat support.
    eregon committed Nov 14, 2014
    Copy the full SHA
    9e6c2be View commit details

Commits on Nov 15, 2014

  1. Fix #2198: Attr assign instructions force a frame push

    * As noted in the github issue comments, access protection
      checks seem to currently fetch the caller's self via the
      frame stack. This means that any scope that has instructions
      that requires access checks will force a frame push for that
      stack.
    
    * For this patch, I have added a fix for attr assign instruction
      which seems to be the only instr that seems to directly call
      Helpers.invoke(..) which then calls the access protection methods
      in RubyClass.
    
      We need to audit if other call instructions require the same
      fixes.
    
    * A better fix would be to fix Helpers.invoke(..) to accept an
      additional argument (caller self) which may be available at the
      call site without accessing the frame stack.
    
    * Added a regression spec that fails without the fix in this patch.
    subbuss committed Nov 15, 2014
    Copy the full SHA
    c0f90f4 View commit details
  2. Merge pull request #2196 from tduehr/prepend_current

    Prepend current
    enebo committed Nov 15, 2014
    Copy the full SHA
    5fcaa8b View commit details

Commits on Nov 16, 2014

  1. Copy the full SHA
    d030fd1 View commit details
  2. Copy the full SHA
    e8ee793 View commit details
  3. Copy the full SHA
    62d4ca2 View commit details
  4. Copy the full SHA
    334871d View commit details
  5. Copy the full SHA
    595d806 View commit details
  6. Copy the full SHA
    6d34912 View commit details
  7. Copy the full SHA
    b0b9cc0 View commit details
  8. Copy the full SHA
    658390a View commit details
  9. Copy the full SHA
    f207640 View commit details
  10. [Truffle] Fix merge.

    chrisseaton committed Nov 16, 2014
    Copy the full SHA
    c623802 View commit details
Showing with 737 additions and 4,543 deletions.
  1. +1 −1 .travis.yml
  2. +9 −2 BUILDING.md
  3. +0 −1 bench/truffle/.gitignore
  4. +0 −100 bench/truffle/binary-trees.rb
  5. +0 −2 bench/truffle/c/Makefile
  6. +0 −151 bench/truffle/c/mandelbrot.c
  7. +0 −137 bench/truffle/compare.rb
  8. +0 −729 bench/truffle/deltablue.rb
  9. +0 −111 bench/truffle/fannkuch-redux.rb
  10. +0 −80 bench/truffle/harness.rb
  11. +0 −143 bench/truffle/java/Mandelbrot.java
  12. +0 −137 bench/truffle/js/mandelbrot.js
  13. +0 −18 bench/truffle/lib/deterministic-random.rb
  14. +0 −121 bench/truffle/mandelbrot-kernel-loop.rb
  15. +0 −112 bench/truffle/mandelbrot.rb
  16. +0 −207 bench/truffle/n-body-dynamic.rb
  17. +0 −188 bench/truffle/n-body.rb
  18. +0 −189 bench/truffle/neural-net.rb
  19. +0 −88 bench/truffle/pidigits.rb
  20. +0 −101 bench/truffle/regression.rb
  21. +0 −25 bench/truffle/report/all.gnuplot
  22. +0 −25 bench/truffle/report/almost-all.gnuplot
  23. +0 −25 bench/truffle/report/competition.gnuplot
  24. +0 −25 bench/truffle/report/interpreters.gnuplot
  25. +0 −25 bench/truffle/report/jruby.gnuplot
  26. +0 −25 bench/truffle/report/other-vms.gnuplot
  27. +0 −25 bench/truffle/report/rbx.gnuplot
  28. +0 −294 bench/truffle/report/report.rb
  29. +0 −25 bench/truffle/report/summary.gnuplot
  30. +0 −25 bench/truffle/report/topaz.gnuplot
  31. +0 −401 bench/truffle/richards.rb
  32. +0 −95 bench/truffle/spectral-norm.rb
  33. +0 −5 core/src/main/java/org/jruby/IncludedModule.java
  34. +0 −126 core/src/main/java/org/jruby/IncludedModuleWrapper.java
  35. +0 −1 core/src/main/java/org/jruby/Ruby.java
  36. +12 −3 core/src/main/java/org/jruby/RubyInstanceConfig.java
  37. +5 −14 core/src/main/java/org/jruby/RubyModule.java
  38. +0 −2 core/src/main/java/org/jruby/TruffleBridge.java
  39. +16 −0 core/src/main/java/org/jruby/ast/Node.java
  40. +5 −0 core/src/main/java/org/jruby/ast/util/SexpMaker.java
  41. +14 −0 core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java
  42. +1 −3 core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
  43. +14 −4 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
  44. +0 −39 core/src/main/java/org/jruby/ext/truffelize/TruffelizeKernel.java
  45. +0 −60 core/src/main/java/org/jruby/ext/truffelize/TruffelizeLibrary.java
  46. +0 −38 core/src/main/java/org/jruby/ext/truffelize/TruffelizeModule.java
  47. +6 −0 core/src/main/java/org/jruby/internal/runtime/methods/CompiledMethod.java
  48. +5 −0 core/src/main/java/org/jruby/internal/runtime/methods/DelegatingDynamicMethod.java
  49. +4 −0 core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
  50. +14 −0 core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
  51. +1 −1 core/src/main/java/org/jruby/ir/interpreter/Interpreter.java
  52. +3 −15 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
  53. +1 −1 core/src/main/java/org/jruby/runtime/Helpers.java
  54. +1 −1 core/src/main/java/org/jruby/runtime/marshal/MarshalStream.java
  55. +0 −6 core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
  56. +2 −62 core/src/main/java/org/jruby/truffle/nodes/core/ArrayDropTailNode.java
  57. +2 −62 core/src/main/java/org/jruby/truffle/nodes/core/ArrayGetTailNode.java
  58. +1 −62 core/src/main/java/org/jruby/truffle/nodes/core/ArrayIndexNode.java
  59. +2 −2 core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
  60. +99 −0 core/src/main/java/org/jruby/truffle/nodes/core/ArraySliceNode.java
  61. +47 −6 core/src/main/java/org/jruby/truffle/nodes/core/ClassNodes.java
  62. +34 −11 core/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
  63. +46 −22 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  64. +67 −3 core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  65. +30 −0 core/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
  66. +37 −2 core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
  67. +1 −1 core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  68. +21 −25 core/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java
  69. +19 −10 core/src/main/java/org/jruby/truffle/nodes/methods/MethodDefinitionNode.java
  70. +4 −6 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadPostArgumentNode.java
  71. +13 −9 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadRestArgumentNode.java
  72. +7 −12 core/src/main/java/org/jruby/truffle/nodes/supercall/AbstractGeneralSuperCallNode.java
  73. +1 −1 core/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
  74. +1 −15 core/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
  75. +20 −0 core/src/main/java/org/jruby/truffle/runtime/ModuleOperations.java
  76. +12 −0 core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  77. +12 −6 core/src/main/java/org/jruby/truffle/runtime/backtrace/MRIBacktraceFormatter.java
  78. +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  79. +22 −3 core/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
  80. +6 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
  81. +2 −2 core/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
  82. +0 −13 core/src/main/java/org/jruby/truffle/runtime/core/RubyObject.java
  83. +2 −0 core/src/main/java/org/jruby/truffle/runtime/core/RubyProc.java
  84. +1 −3 core/src/main/java/org/jruby/truffle/runtime/core/RubySymbol.java
  85. +5 −1 core/src/main/java/org/jruby/truffle/runtime/methods/RubyMethod.java
  86. +0 −12 core/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
  87. +1 −2 core/src/main/java/org/jruby/truffle/runtime/objectstorage/ObjectStorage.java
  88. +13 −6 core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  89. +23 −34 core/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
  90. +2 −14 core/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java
  91. +0 −1 core/src/main/java/org/jruby/truffle/translator/Translator.java
  92. +3 −3 core/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
  93. 0 ...sion/{GH-1633_bigdecimal_operations_with_nil.rb → GH-1633_bigdecimal_operations_with_nil_spec.rb}
  94. +27 −0 spec/regression/GH-2198_test_access_protections.rb
  95. +0 −1 spec/tags/ruby/core/module/prepend_tags.txt
  96. +0 −1 spec/tags/ruby/core/module/prepended_tags.txt
  97. +1 −0 spec/truffle/tags/core/module/define_method_tags.txt
  98. +1 −0 spec/truffle/tags/core/module/include_tags.txt
  99. +3 −0 spec/truffle/tags/core/module/module_function_tags.txt
  100. +3 −0 spec/truffle/tags/core/module/prepend_tags.txt
  101. +0 −3 spec/truffle/tags/language/BEGIN_tags.txt
  102. +0 −2 spec/truffle/tags/language/array_tags.txt
  103. +0 −7 spec/truffle/tags/language/block_tags.txt
  104. +0 −16 spec/truffle/tags/language/def_tags.txt
  105. +0 −2 spec/truffle/tags/language/lambda_tags.txt
  106. +0 −15 spec/truffle/tags/language/send_tags.txt
  107. +3 −2 spec/truffle/tags/language/super_tags.txt
  108. +0 −106 spec/truffle/truffelize_spec.rb
  109. +21 −16 tool/build-graal-bundles.sh
  110. +7 −7 tool/remove-bundled-truffle.sh
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ branches:
before_install:
- if [[ $TRAVIS_JDK_VERSION = 'oraclejdk8' ]]; then sudo apt-get update; sudo apt-get install oracle-java8-installer; else true; fi

script: mvn -q clean package ; travis_retry mvn install $TARGET -Dinvoker.skip=false | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]
script: travis_retry mvn -q -Pbootstrap clean package ; mvn install $TARGET -Dinvoker.skip=false | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]
install: /bin/true
notifications:
irc:
11 changes: 9 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -131,12 +131,19 @@ bin/jruby -S rake test:mri
This suite takes a while to complete, so if you want to run an individual file
from MRI's tests (under test/mri), use one of the following commands:

```
# Run a specific test method in a specific file
```
jruby <test file> -n <specific test method>
```

# Run a test file with known-failing tests excluded
EXCLUDE_DIR=test/mri/excludes jruby -r minitest/excludes <test file>
```
EXCLUDES=test/mri/excludes bin/jruby -r test/mri_test_env.rb test/mri/runner.rb -q -- <test file>
```

Additional tests may be run through mspec.
```
bin/jruby -S mspec -B spec/jruby.2.2.mspec -t bin/jruby -G fails ci <test files>
```

For more complete assurance, you can also run 1.9 RubySpecs via the
1 change: 0 additions & 1 deletion bench/truffle/.gitignore

This file was deleted.

100 changes: 0 additions & 100 deletions bench/truffle/binary-trees.rb

This file was deleted.

2 changes: 0 additions & 2 deletions bench/truffle/c/Makefile

This file was deleted.

151 changes: 0 additions & 151 deletions bench/truffle/c/mandelbrot.c

This file was deleted.

Loading