From fca68886deeda18a41a0b68226ff54acfe943a07 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 23 May 2010 10:24:29 +0000
Subject: [PATCH] merges r27848 from trunk into ruby_1_9_2. -- * eval.c
 (setup_exception): let SystemStackError#backtrace return an   single element
 array instead of string itself.  [ruby-core:30196]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 eval.c    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 228be9db32..004f9f010a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 16 22:17:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval.c (setup_exception): let SystemStackError#backtrace return an
+	  single element array instead of string itself.  [ruby-core:30196]
+
 Sun May 23 17:29:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* common.mk (capi): uses a timestamp file to get rid of 
diff --git a/eval.c b/eval.c
index 99f28dc8e6..95d1b8c860 100644
--- a/eval.c
+++ b/eval.c
@@ -380,6 +380,7 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
     if (file && !NIL_P(mesg)) {
 	if (mesg == sysstack_error) {
 	    at = rb_enc_sprintf(rb_usascii_encoding(), "%s:%d", file, line);
+	    at = rb_ary_new3(1, at);
 	    rb_iv_set(mesg, "bt", at);
 	}
 	else {