From ee7f8d4805fb4a661b8e8328be49f32cbc3e606d Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 12 Apr 2012 01:33:34 +0000 Subject: * compile.c (compile_array, compile_array_): Divide big array (or hash) literals into several blocks and concatetene them. There was a problem that a big array (hash) literal causes SystemStackError exception (stack overflow) because VM push all contents of the literal onto VM stack to make an array (or hash). To solve this issue, we make several arrays (hashes) and concatenate them to make a big array (hash) object. ?? * compile.c (iseq_compile_each, setup_args): use modified compile_array. * vm.c (m_core_hash_from_ary, m_core_hash_merge_ary, m_core_hash_merge_ptr): added for above change. * id.c (Init_id), parse.y: add core method ids. * bootstraptest/test_literal.rb: add simple tests. * bootstraptest/test_eval.rb: remove rescue clause to catch SystemStackError exception. * test/ruby/test_literal.rb: add tests to check no stack overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 3 +++ 1 file changed, 3 insertions(+) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 5d8cc08a74..e784e8b432 100644 --- a/parse.y +++ b/parse.y @@ -802,6 +802,9 @@ static void token_info_pop(struct parser_params*, const char *token); %nonassoc id_core_define_method %nonassoc id_core_define_singleton_method %nonassoc id_core_set_postexe +%nonassoc id_core_hash_from_ary +%nonassoc id_core_hash_merge_ary +%nonassoc id_core_hash_merge_ptr %token tLAST_TOKEN -- cgit v1.2.3