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: 886c91a40f8b
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94f6f9da8ae3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 17, 2016

  1. [Truffle] Set java.home system property for TCK tests.

    Without explicitly setting this, JRuby will try to figure out its path from a classloader. Maven runs tests in its own isolated classloader which fails the search and JRuby subsequently falls back to whatever the java.io.tmpdir propert is set to. This can impact us because we push values onto  relative to jruby.home. Since jt.rb already knows the correct jruby.home value, we just set the system property here to avoid the search.
    nirvdrum committed May 17, 2016
    Copy the full SHA
    ef9847a View commit details
  2. [Truffle] Don't apply frozen string literals to files loaded from core.

    This isn't ideal, but is necessary for now as Ruby implementations of core methods may try to modify references to literal strings.
    nirvdrum committed May 17, 2016
    Copy the full SHA
    94f6f9d View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 tool/jt.rb
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -659,7 +659,7 @@ def test_specs(command, *args)
private :test_specs

def test_tck(*args)
mvn *args + ['test']
mvn *args + ["-DargLine='-Djruby.home=#{JRUBY_DIR}'", 'test']
end
private :test_tck

Original file line number Diff line number Diff line change
@@ -2944,7 +2944,7 @@ public RubyNode visitStrNode(org.jruby.ast.StrNode node) {

final RubyNode ret;

if (node.isFrozen()) {
if (node.isFrozen() && !getSourcePath(sourceSection).startsWith(context.getCoreLibrary().getCoreLoadPath() + "/core/")) {
final DynamicObject frozenString = context.getFrozenStrings().getFrozenString(rope);

ret = new DefinedWrapperNode(context, sourceSection, context.getCoreStrings().METHOD,