summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 22:55:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 22:55:59 +0000
commitfee7d48517cbf14b6ddc35ee584393fa9e6d90cd (patch)
tree6051ce6a6e6cb978e3fd74b5a27fb98c5bf943d8
parent0df55df4964145c45d03636e63e292e17a7eb433 (diff)
vm_eval.c: fix super from eval with scope
* vm_eval.c (eval_string_with_cref): fix super from eval with scope. set klass in the current control frame to the class of the receiver in the context to be evaluated, this class/module must match the actual receiver to call super. [ruby-core:65122] [Bug #10263] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--test/ruby/test_super.rb15
-rw-r--r--vm_eval.c3
3 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d36467..014ab35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Sep 20 07:55:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_eval.c (eval_string_with_cref): fix super from eval with
+ scope. set klass in the current control frame to the class of
+ the receiver in the context to be evaluated, this class/module
+ must match the actual receiver to call super.
+ [ruby-core:65122] [Bug #10263]
+
Fri Sep 19 20:06:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* symbol.c (rb_str_dynamic_intern): check if the stem ID of
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index bea490d..820e221 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -493,4 +493,19 @@ class TestSuper < Test::Unit::TestCase
end
assert_equal(%w[B A], result, bug9721)
end
+
+ def test_from_eval
+ bug10263 = '[ruby-core:65122] [Bug #10263a]'
+ a = Class.new do
+ def foo
+ "A"
+ end
+ end
+ b = Class.new(a) do
+ def foo
+ binding.eval("super")
+ end
+ end
+ assert_equal("A", b.new.foo, bug10263)
+ end
end
diff --git a/vm_eval.c b/vm_eval.c
index 5cb7293..22b3e1e 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1215,7 +1215,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg,
absolute_path = file;
}
- if (scope != Qnil) {
+ if (!NIL_P(scope)) {
bind = Check_TypedStruct(scope, &ruby_binding_data_type);
{
envval = bind->env;
@@ -1265,6 +1265,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg,
COPY_CREF(cref, orig_cref);
}
vm_set_eval_stack(th, iseqval, cref, base_block);
+ th->cfp->klass = CLASS_OF(base_block->self);
RB_GC_GUARD(crefval);
if (0) { /* for debug */