* Merge YARV

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

test/ruby/test_alias.rb

@@ -2,39 +2,63 @@ require 'test/unit'
 
 class TestAlias < Test::Unit::TestCase
   class Alias0
-    def foo; "foo" end
+    def foo
+      "foo"
+    end
   end
-  class Alias1<Alias0
+
+  class Alias1 < Alias0
     alias bar foo
-    def foo; "foo+" + super end
+
+    def foo
+      "foo+#{super}"
+    end
   end
-  class Alias2<Alias1
+
+  class Alias2 < Alias1
     alias baz foo
     undef foo
   end
-  class Alias3<Alias2
+
+  class Alias3 < Alias2
     def foo
-      defined? super
+      super
     end
+
     def bar
-      defined? super
+      super
     end
+
     def quux
-      defined? super
+      super
     end
   end
 
   def test_alias
     x = Alias2.new
-    assert_equal("foo", x.bar)
-    assert_equal("foo+foo", x.baz)
-
-    # test_check for cache
-    assert_equal("foo+foo", x.baz)
+    assert_equal "foo", x.bar
+    assert_equal "foo+foo", x.baz
+    assert_equal "foo+foo", x.baz   # test_check for cache
 
     x = Alias3.new
-    assert(!x.foo)
-    assert(x.bar)
-    assert(!x.quux)
+    assert_raise(NoMethodError) { x.foo }
+    assert_equal "foo", x.bar
+    assert_raise(NoMethodError) { x.quux }
+  end
+   
+  class C
+    def m
+      $SAFE
+    end
+  end
+
+  def test_JVN_83768862
+    d = lambda {
+      $SAFE = 4
+      dclass = Class.new(C)
+      dclass.funcall(:alias_method, :mm, :m)
+      dclass.new
+    }.call
+    assert_raise(SecurityError) { d.mm }
   end
 end