nobu	2012-09-25 09:59:29 +0900 (Tue, 25 Sep 2012)

  New Revision: 37030

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37030

  Log:
    insns.def: super from at_exit
    
    * insns.def (invokesuper): klass in cfp is not valid in at_exit and
      END blocks.  [ruby-core:47680] [Bug #7064]

  Modified files:
    trunk/ChangeLog
    trunk/insns.def
    trunk/test/ruby/test_super.rb
    trunk/vm_insnhelper.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37029)
+++ ChangeLog	(revision 37030)
@@ -1,3 +1,8 @@
+Tue Sep 25 09:59:26 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* insns.def (invokesuper): klass in cfp is not valid in at_exit and
+	  END blocks.  [ruby-core:47680] [Bug #7064]
+
 Tue Sep 25 08:11:11 2012  NARUSE, Yui  <naruse@r...>
 
 	* iseq.c (rb_iseq_defined_string): the index of defined_strings must
Index: insns.def
===================================================================
--- insns.def	(revision 37029)
+++ insns.def	(revision 37030)
@@ -1035,6 +1035,9 @@
     flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
 
     klass = GET_CFP()->klass;
+    if (NIL_P(klass)) {
+	vm_super_outside();
+    }
     if (!NIL_P(RCLASS_REFINED_CLASS(klass))) {
 	klass = RCLASS_REFINED_CLASS(klass);
     }
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 37029)
+++ vm_insnhelper.c	(revision 37030)
@@ -1460,6 +1460,12 @@
 }
 
 static void
+vm_super_outside(void)
+{
+    rb_raise(rb_eNoMethodError, "super called outside of method");
+}
+
+static void
 vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *iseq,
 		     VALUE sigval,
 		     ID *idp, VALUE *klassp)
@@ -1472,7 +1478,7 @@
     }
 
     if (iseq == 0) {
-	rb_raise(rb_eNoMethodError, "super called outside of method");
+	vm_super_outside();
     }
 
     id = iseq->defined_method_id;
@@ -1492,8 +1498,7 @@
 	    while (1) {
 		lcfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(lcfp);
 		if (RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, lcfp)) {
-		    rb_raise(rb_eNoMethodError,
-			     "super called outside of method");
+		    vm_super_outside();
 		}
 		if (lcfp->ep == tep) {
 		    break;
@@ -1503,7 +1508,7 @@
 
 	/* temporary measure for [Bug #2420] [Bug #3136] */
 	if (!lcfp->me) {
-	    rb_raise(rb_eNoMethodError, "super called outside of method");
+	    vm_super_outside();
 	}
 
 	id = lcfp->me->def->original_id;
Index: test/ruby/test_super.rb
===================================================================
--- test/ruby/test_super.rb	(revision 37029)
+++ test/ruby/test_super.rb	(revision 37030)
@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative 'envutil'
 
 class TestSuper < Test::Unit::TestCase
   class Base
@@ -347,4 +348,14 @@
 
     assert_equal 'hoge', foo.new.bar
   end
+
+  def test_super_in_at_exit
+    bug7064 = '[ruby-core:47680]'
+    assert_normal_exit "at_exit {super}", bug7064
+  end
+
+  def test_super_in_END
+    bug7064 = '[ruby-core:47680]'
+    assert_normal_exit "END {super}", bug7064
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/