* iseq.c (rb_iseq_defined_string): the index of defined_strings must

  be the value of type - 1.

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

3 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1df6829c15..056ecfb727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 25 08:11:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* iseq.c (rb_iseq_defined_string): the index of defined_strings must
+	  be the value of type - 1.
+
 Mon Sep 24 17:36:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (defined_expr), insns.def (defined): share single frozen
diff --git a/iseq.c b/iseq.c
index 989a8a1120..e34537e871 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1779,11 +1779,11 @@ rb_iseq_defined_string(enum defined_type type)
 	defs = ruby_xcalloc(numberof(expr_names), sizeof(VALUE));
 	GET_VM()->defined_strings = defs;
     }
-    str = defs[type];
+    str = defs[type-1];
     if (!str) {
 	str = rb_str_new_cstr(estr);;
 	OBJ_FREEZE(str);
-	defs[type] = str;
+	defs[type-1] = str;
     }
     return str;
 }
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb
index ec37488c81..fe985340c1 100644
--- a/test/ruby/test_defined.rb
+++ b/test/ruby/test_defined.rb
@@ -84,6 +84,11 @@ class TestDefined < Test::Unit::TestCase
     assert_equal 'global-variable', defined?($+)
     assert_equal 'global-variable', defined?($1)
     assert_equal nil, defined?($2)
+
+    assert_equal("nil", defined?(nil))
+    assert_equal("true", defined?(true))
+    assert_equal("false", defined?(false))
+    assert_equal("expression", defined?(1))
   end
 
   def test_defined_impl_specific