merges r24403 and r24439 from trunk into ruby_1_9_1.

--
* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
  [ruby-core:24767]
--
* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.

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

1 files changed, 6 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 3cbc60f47c..49d544f1c4 100644
--- a/eval.c
+++ b/eval.c
@@ -413,12 +413,18 @@ rb_longjmp(int tag, VALUE mesg)
 void
 rb_exc_raise(VALUE mesg)
 {
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
 rb_exc_fatal(VALUE mesg)
 {
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_FATAL, mesg);
 }