merge revision(s) 38292: [Backport #6899]

	* compile.c (iseq_compile_each): count flip-flop state in local iseq
	  not in each iseqs, so that the keys can be other than hidden
	  strings.  [ruby-core:47253] [Bug #6899]

	* vm_insnhelper.c (lep_svar_get, lep_svar_set, vm_getspecial): store
	  flip-flop states in an array instead of a hash.

	* iseq.c (set_relation): main iseq also can has local scope.


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

1 files changed, 2 insertions, 0 deletions

diff --git a/iseq.h b/iseq.h
index beeacbb236..85336d93d8 100644
--- a/iseq.h
+++ b/iseq.h
@@ -118,6 +118,8 @@ enum defined_type {
     DEFINED_FUNC
 };
 
+#define DEFAULT_SPECIAL_VAR_COUNT 2
+
 #if defined __GNUC__ && __GNUC__ >= 4
 #pragma GCC visibility pop
 #endif