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

Commits on Apr 20, 2015

  1. Squashed 'spec/ruby/' changes from 44248dc..45d075c 

    45d075c Add missing behavior expectation in last spec.
fd39782 Add a spec for Module#method_added with undef_method.

git-subtree-dir: spec/ruby
git-subtree-split: 45d075c8c47ef0cc15ee5cb126806148ad0f5d35
    @eregon
    eregon committed Apr 20, 2015
    Copy the full SHA
    2c38858 View commit details

  2. Merge commit '2c38858448ab88921a8b04913f84cb7eeb2b9088'

    @eregon
    eregon committed Apr 20, 2015
    Copy the full SHA
    1f47333 View commit details

  3. [Truffle] Do not call method_added in undef_method. 

    * Fix #2849.
    @eregon
    eregon committed Apr 20, 2015
    Copy the full SHA
    d67a173 View commit details
Showing with 15 additions and 1 deletion.
  1. +14 −0 spec/ruby/core/module/method_added_spec.rb
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
14 changes: 14 additions & 0 deletions spec/ruby/core/module/method_added_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -33,4 +33,18 @@ def test() end
$methods_added = nil
end
end

it "is not called when a method is undefined in self" do
m = Module.new do
def method_to_undef
end

def self.method_added(name)
fail("method_added called by undef_method")
end

undef_method :method_to_undef
end
m.should_not have_method(:method_to_undef)
end
end
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -283,7 +283,7 @@ public void addMethod(Node currentNode, InternalMethod method) {
methods.put(method.getName(), method.withDeclaringModule(this));
newVersion();

if (context.getCoreLibrary().isLoaded()) {
if (context.getCoreLibrary().isLoaded() && !method.isUndefined()) {
DebugOperations.send(context, this, "method_added", null, context.getSymbolTable().getSymbol(method.getName()));
}
}