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

Commits on May 12, 2015

  1. [Truffle] Do not call undefined methods with debug send.

    @eregon
    eregon committed May 12, 2015
    Copy the full SHA
    743b0dc View commit details

  2. [Truffle] Silence shadowed variable warning when running MSpec.

    @eregon
    eregon committed May 12, 2015
    Copy the full SHA
    28af3af View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java
  2. +1 −1 truffle/src/main/ruby/core/rubinius/common/array.rb
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ public static Object send(RubyContext context, Object object, String methodName,

final InternalMethod method = ModuleOperations.lookupMethod(context.getCoreLibrary().getMetaClass(object), methodName);

if (method == null) {
if (method == null || method.isUndefined()) {
return null;
}

2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/rubinius/common/array.rb
View file
Original file line number Diff line number Diff line change
@@ -1012,7 +1012,7 @@ def sample(count=undefined, options=undefined)
result = Array.new self
tuple = Rubinius::Mirror::Array.reflect(result).tuple

count.times { |i| tuple.swap i, rng.rand(size) }
count.times { |c| tuple.swap c, rng.rand(size) } # Truffle: removed shadowing variable

return count == size ? result : result[0, count]
end