fix a bug in defined?(super) which returns the incorrect value if use in included module

Watson1978 · Watson1978 · commit 729bf7893527 · 2013-06-17T13:30:41.000+09:00
Test Code:
----
module Stuff
  def foo
    puts "In Stuff#foo"
    if defined?(super)
      puts "Calling super"
      super
    else
      puts "No super"
    end
  end
end

module OtherStuff
  def foo
    puts "In OtherStuff#foo"
    p defined?(super)
  end
end

class NoSuper
  include Stuff
end
NoSuper.new.foo

class WithSuper
  include OtherStuff
  include Stuff
end
WithSuper.new.foo

Result
----
$ macruby t.rb
In Stuff#foo
Calling super
/Volumes/Mac/Users/watson/tmp/t.rb:6:in `foo': super: no superclass method `foo' for #&lt;NoSuper:0x4001a33a0&gt; (NoMethodError)
	from /Volumes/Mac/Users/watson/tmp/t.rb:23:in `&lt;main&gt;'

Expected
----
$ ruby t.rb
In Stuff#foo
No super
In Stuff#foo
Calling super
In OtherStuff#foo
nil
diff --git a/vm.cpp b/vm.cpp
@@ -1687,16 +1687,31 @@ rb_vm_defined(VALUE self, int type, VALUE what, VALUE what2, rb_vm_outer_t *oute
 	case DEFINED_SUPER:
 	case DEFINED_METHOD:
 	    {
-		VALUE klass = CLASS_OF(self);
-		if (type == DEFINED_SUPER) {
-		    klass = RCLASS_SUPER(klass);
-		}
 		if (what == 0) {
 		    rb_raise(rb_eRuntimeError,
 			    "defined?(super) out of a method block isn't supported");
 		}
+
+		VALUE klass = CLASS_OF(self);
 		const char *idname = rb_id2name((ID)what);
 		SEL sel = sel_registerName(idname);
+		if (type == DEFINED_SUPER) {
+		    Class current_super_class = GET_VM()->get_current_super_class();
+		    if (current_super_class) {
+			klass = (VALUE)current_super_class;
+			sel = GET_VM()->get_current_super_sel();
+		    }
+		    else {
+			klass = RCLASS_SUPER(klass);
+		    }
+		    VALUE ary = rb_attr_get(klass, idIncludedModules);
+		    if (ary != Qnil) {
+			int count = RARRAY_LEN(ary);
+			for (int i = 0; i < count; i++) {
+			    klass = RCLASS_SUPER(klass);
+			}
+		    }
+		}
 
 		bool ok = class_getInstanceMethod((Class)klass, sel) != NULL;
 		if (!ok && idname[strlen(idname) - 1] != ':') {
