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

Commits on Jun 23, 2016

  1. Copy the full SHA
    61ee324 View commit details
  2. Copy the full SHA
    1d583ec View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  2. +1 −1 truffle/src/main/ruby/core/truffle/cext.rb
Original file line number Diff line number Diff line change
@@ -1261,7 +1261,7 @@ public DynamicObject initialize(DynamicObject self, DynamicObject from) {
return self;
}

@Specialization(guards = { "!isRubyString(from)", "wasProvided(from)" })
@Specialization(guards = { "!isRubyString(from)", "!isString(from)", "wasProvided(from)" })
public DynamicObject initialize(VirtualFrame frame, DynamicObject self, Object from) {
if (toStrNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/truffle/cext.rb
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ def rb_intern(str)
end

def rb_str_new_cstr(java_string)
String.new(java_string)
::String.new(java_string)
end

def rb_intern_str(string)