debase-ruby_core_source 0.9.9 → 0.9.10

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.2.8-p477}/symbol.h

@@ -17,10 +17,10 @@
 #define DYNAMIC_ID_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID)
 #define STATIC_ID2SYM(id)  (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
 
-#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
+#ifdef __GNUC__
 #define rb_id2sym(id) \
-    RB_GNUC_EXTENSION_BLOCK(__builtin_constant_p(id) && !DYNAMIC_ID_P(id) ? \
-			    STATIC_ID2SYM(id) : rb_id2sym(id))
+    __extension__(__builtin_constant_p(id) && !DYNAMIC_ID_P(id) ? \
+		  STATIC_ID2SYM(id) : rb_id2sym(id))
 #endif
 
 struct RSymbol {
@@ -32,38 +32,23 @@ struct RSymbol {
 
 #define RSYMBOL(obj) (R_CAST(RSymbol)(obj))
 
-#define is_notop_id(id) ((id)>tLAST_OP_ID)
-#define is_local_id(id) (id_type(id)==ID_LOCAL)
-#define is_global_id(id) (id_type(id)==ID_GLOBAL)
-#define is_instance_id(id) (id_type(id)==ID_INSTANCE)
-#define is_attrset_id(id) ((id)==idASET||id_type(id)==ID_ATTRSET)
-#define is_const_id(id) (id_type(id)==ID_CONST)
-#define is_class_id(id) (id_type(id)==ID_CLASS)
-#define is_junk_id(id) (id_type(id)==ID_JUNK)
-
 static inline int
 id_type(ID id)
 {
-    if (is_notop_id(id)) {
-	return (int)(id&ID_SCOPE_MASK);
-    }
-    else {
+    if (id<=tLAST_OP_ID) {
 	return -1;
     }
+    return (int)(id&ID_SCOPE_MASK);
 }
 
-typedef uint32_t rb_id_serial_t;
-
-static inline rb_id_serial_t
-rb_id_to_serial(ID id)
-{
-    if (is_notop_id(id)) {
-	return (rb_id_serial_t)(id >> ID_SCOPE_SHIFT);
-    }
-    else {
-	return (rb_id_serial_t)id;
-    }
-}
+#define is_notop_id(id) ((id)>tLAST_OP_ID)
+#define is_local_id(id) (id_type(id)==ID_LOCAL)
+#define is_global_id(id) (id_type(id)==ID_GLOBAL)
+#define is_instance_id(id) (id_type(id)==ID_INSTANCE)
+#define is_attrset_id(id) (id_type(id)==ID_ATTRSET)
+#define is_const_id(id) (id_type(id)==ID_CONST)
+#define is_class_id(id) (id_type(id)==ID_CLASS)
+#define is_junk_id(id) (id_type(id)==ID_JUNK)
 
 static inline int
 sym_type(VALUE sym)
@@ -100,9 +85,4 @@ is_global_name_punct(const int c)
 
 ID rb_intern_cstr_without_pindown(const char *, long, rb_encoding *);
 
-RUBY_SYMBOL_EXPORT_BEGIN
-
-size_t rb_sym_immortal_count(void);
-
-RUBY_SYMBOL_EXPORT_END
 #endif

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview3 → ruby-2.2.8-p477}/thread_pthread.h

@@ -2,7 +2,7 @@
 
   thread_pthread.h -
 
-  $Author: kosaki $
+  $Author: normal $
 
   Copyright (C) 2004-2007 Koichi Sasada
 
@@ -26,7 +26,7 @@ typedef struct rb_thread_cond_struct {
 } rb_nativethread_cond_t;
 
 typedef struct native_thread_data_struct {
-    struct list_node ubf_list;
+    void *signal_thread_list;
     rb_nativethread_cond_t sleep_cond;
 } native_thread_data_t;
 

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview3 → ruby-2.2.8-p477}/transcode_data.h

@@ -46,26 +46,10 @@ RUBY_SYMBOL_EXPORT_BEGIN
 #define makeSTR1LEN(len) ((len)-4)
 
 #define o1(b1)		(PType((((unsigned char)(b1))<<8)|ONEbt))
-#define o2(b1,b2)	(PType((((unsigned char)(b1))<<8)|\
-			       (((unsigned char)(b2))<<16)|\
-			       TWObt))
-#define o3(b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|\
-				(((unsigned char)(b2))<<16)|\
-				(((unsigned int)(unsigned char)(b3))<<24)|\
-				THREEbt)&\
-			       0xffffffffU))
-#define o4(b0,b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|\
-				(((unsigned char)(b2))<<16)|\
-				(((unsigned int)(unsigned char)(b3))<<24)|\
-				((((unsigned char)(b0))&0x07)<<5)|\
-				FOURbt)&\
-			       0xffffffffU))
-#define g4(b0,b1,b2,b3) (PType(((((unsigned char)(b0))<<8)|\
-				(((unsigned char)(b2))<<16)|\
-				((((unsigned char)(b1))&0x0f)<<24)|\
-				((((unsigned int)(unsigned char)(b3))&0x0f)<<28)|\
-				GB4bt)&\
-			       0xffffffffU))
+#define o2(b1,b2)	(PType((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|TWObt))
+#define o3(b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned int)(unsigned char)(b3))<<24)|THREEbt)&0xffffffffU))
+#define o4(b0,b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt)&0xffffffffU))
+#define g4(b0,b1,b2,b3) (PType(((((unsigned char)(b0))<<8)|(((unsigned char)(b2))<<16)|((((unsigned char)(b1))&0x0f)<<24)|((((unsigned int)(unsigned char)(b3))&0x0f)<<28)|GB4bt)&0xffffffffU))
 #define funsio(diff)	(PType((((unsigned int)(diff))<<8)|FUNsio))
 
 #define getBT1(a)	((unsigned char)((a)>> 8))
@@ -86,9 +70,9 @@ RUBY_SYMBOL_EXPORT_BEGIN
 #define THREETRAIL     /* legal but undefined if three more trailing UTF-8 */
 
 typedef enum {
-    asciicompat_converter,        /* ASCII-compatible -> ASCII-compatible */
-    asciicompat_decoder,          /* ASCII-incompatible -> ASCII-compatible */
-    asciicompat_encoder           /* ASCII-compatible -> ASCII-incompatible */
+  asciicompat_converter,        /* ASCII-compatible -> ASCII-compatible */
+  asciicompat_decoder,          /* ASCII-incompatible -> ASCII-compatible */
+  asciicompat_encoder           /* ASCII-compatible -> ASCII-incompatible */
   /* ASCII-incompatible -> ASCII-incompatible is intentionally omitted. */
 } rb_transcoder_asciicompat_type_t;
 

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview1 → ruby-2.2.8-p477}/version.h

@@ -1,31 +1,13 @@
-#define RUBY_VERSION "2.4.0"
-#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL -1
+#define RUBY_VERSION "2.2.8"
+#define RUBY_RELEASE_DATE "2017-09-14"
+#define RUBY_PATCHLEVEL 477
 
-#define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_YEAR 2017
+#define RUBY_RELEASE_MONTH 9
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 
-#ifndef TOKEN_PASTE
-#define TOKEN_PASTE(x,y) x##y
-#endif
-#define ONLY_ONE_DIGIT(x) TOKEN_PASTE(10,x) < 1000
-#define WITH_ZERO_PADDING(x) TOKEN_PASTE(0,x)
-#define RUBY_BIRTH_YEAR_STR STRINGIZE(RUBY_BIRTH_YEAR)
-#define RUBY_RELEASE_YEAR_STR STRINGIZE(RUBY_RELEASE_YEAR)
-#if ONLY_ONE_DIGIT(RUBY_RELEASE_MONTH)
-#define RUBY_RELEASE_MONTH_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_MONTH))
-#else
-#define RUBY_RELEASE_MONTH_STR STRINGIZE(RUBY_RELEASE_MONTH)
-#endif
-#if ONLY_ONE_DIGIT(RUBY_RELEASE_DAY)
-#define RUBY_RELEASE_DAY_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_DAY))
-#else
-#define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
-#endif
-
 #if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
 # if RUBY_LIB_VERSION_STYLE == 3
 #   define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)"."STRINGIZE(RUBY_API_VERSION_TEENY)
@@ -35,7 +17,7 @@
 #endif
 
 #if RUBY_PATCHLEVEL == -1
-#define RUBY_PATCHLEVEL_STR "preview1"
+#define RUBY_PATCHLEVEL_STR "dev"
 #else
 #define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
 #endif
@@ -48,10 +30,7 @@
 #endif
 
 #if RUBY_REVISION
-# if RUBY_PATCHLEVEL == -1
-#  ifndef RUBY_BRANCH_NAME
-#   define RUBY_BRANCH_NAME "trunk"
-#  endif
+# ifdef RUBY_BRANCH_NAME
 #  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
 # else
 #  define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
@@ -68,6 +47,6 @@
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT		    \
     "ruby - Copyright (C) "	    \
-    RUBY_BIRTH_YEAR_STR"-"   \
-    RUBY_RELEASE_YEAR_STR" " \
+    STRINGIZE(RUBY_BIRTH_YEAR)"-"   \
+    STRINGIZE(RUBY_RELEASE_YEAR)" " \
     RUBY_AUTHOR

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.2.8-p477}/vm.inc

@@ -53,7 +53,7 @@ INSN_ENTRY(getlocal){
 {
 #line 60 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
@@ -88,13 +88,13 @@ INSN_ENTRY(setlocal){
 {
 #line 83 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
 	ep = GET_PREV_EP(ep);
     }
-    vm_env_write(ep, -(int)idx, val);
+    *(ep - idx) = val;
 
 #line 100 "vm.inc"
 #undef CURRENT_INSN_setlocal
@@ -224,9 +224,10 @@ INSN_ENTRY(getclassvariable){
   COLLECT_USAGE_OPERAND(BIN(getclassvariable), 0, id);
 {
 #line 162 "insns.def"
-    val = rb_cvar_get(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id);
+    NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
+    val = rb_cvar_get(vm_get_cvar_base(cref, GET_CFP()), id);
 
-#line 230 "vm.inc"
+#line 231 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getclassvariable
@@ -249,11 +250,11 @@ INSN_ENTRY(setclassvariable){
   COLLECT_USAGE_INSN(BIN(setclassvariable));
   COLLECT_USAGE_OPERAND(BIN(setclassvariable), 0, id);
 {
-#line 176 "insns.def"
-    vm_ensure_not_refinement_module(GET_SELF());
-    rb_cvar_set(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id, val);
+#line 177 "insns.def"
+    NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
+    rb_cvar_set(vm_get_cvar_base(cref, GET_CFP()), id, val);
 
-#line 257 "vm.inc"
+#line 258 "vm.inc"
 #undef CURRENT_INSN_setclassvariable
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -275,10 +276,10 @@ INSN_ENTRY(getconstant){
   COLLECT_USAGE_INSN(BIN(getconstant));
   COLLECT_USAGE_OPERAND(BIN(getconstant), 0, id);
 {
-#line 198 "insns.def"
-    val = vm_get_ev_const(th, klass, id, 0);
+#line 199 "insns.def"
+    val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0);
 
-#line 282 "vm.inc"
+#line 283 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getconstant
@@ -302,9 +303,8 @@ INSN_ENTRY(setconstant){
   COLLECT_USAGE_INSN(BIN(setconstant));
   COLLECT_USAGE_OPERAND(BIN(setconstant), 0, id);
 {
-#line 220 "insns.def"
+#line 221 "insns.def"
     vm_check_if_namespace(cbase);
-    vm_ensure_not_refinement_module(GET_SELF());
     rb_const_set(cbase, id, val);
 
 #line 311 "vm.inc"
@@ -461,10 +461,10 @@ INSN_ENTRY(putspecialobject){
 	val = rb_mRubyVMFrozenCore;
 	break;
       case VM_SPECIAL_OBJECT_CBASE:
-	val = vm_get_cbase(GET_EP());
+	val = vm_get_cbase(GET_ISEQ(), GET_EP());
 	break;
       case VM_SPECIAL_OBJECT_CONST_BASE:
-	val = vm_get_const_base(GET_EP());
+	val = vm_get_const_base(GET_ISEQ(), GET_EP());
 	break;
       default:
 	rb_bug("putspecialobject insn: unknown value_type");
@@ -494,7 +494,7 @@ INSN_ENTRY(putiseq){
   COLLECT_USAGE_OPERAND(BIN(putiseq), 0, iseq);
 {
 #line 342 "insns.def"
-    ret = (VALUE)iseq;
+    ret = iseq->self;
 
 #line 500 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
@@ -546,10 +546,16 @@ INSN_ENTRY(concatstrings){
   COLLECT_USAGE_OPERAND(BIN(concatstrings), 0, num);
 {
 #line 370 "insns.def"
-    val = rb_str_concat_literals(num, &TOPN(num-1));
+    rb_num_t i = num - 1;
+
+    val = rb_str_resurrect(TOPN(i));
+    while (i-- > 0) {
+	const VALUE v = TOPN(i);
+	rb_str_append(val, v);
+    }
     POPN(num);
 
-#line 553 "vm.inc"
+#line 559 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_concatstrings
@@ -571,10 +577,10 @@ INSN_ENTRY(tostring){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(tostring));
 {
-#line 385 "insns.def"
+#line 391 "insns.def"
     val = rb_obj_as_string(val);
 
-#line 578 "vm.inc"
+#line 584 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_tostring
@@ -582,35 +588,6 @@ INSN_ENTRY(tostring){
 #undef INSN_LABEL
 #undef LABEL_IS_SC
   END_INSN(tostring);}}}
-INSN_ENTRY(freezestring){
-{
-  VALUE debug_info = (VALUE)GET_OPERAND(1);
-  VALUE str = TOPN(0);
-  DEBUG_ENTER_INSN("freezestring");
-  ADD_PC(1+1);
-  PREFETCH(GET_PC());
-  POPN(1);
-  #define CURRENT_INSN_freezestring 1
-  #define INSN_IS_SC()     0
-  #define INSN_LABEL(lab)  LABEL_freezestring_##lab
-  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
-  COLLECT_USAGE_INSN(BIN(freezestring));
-  COLLECT_USAGE_OPERAND(BIN(freezestring), 0, debug_info);
-{
-#line 399 "insns.def"
-    if (!NIL_P(debug_info)) {
-	rb_ivar_set(str, id_debug_created_info, debug_info);
-    }
-    rb_str_freeze(str);
-
-#line 607 "vm.inc"
-  CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
-  PUSH(str);
-#undef CURRENT_INSN_freezestring
-#undef INSN_IS_SC
-#undef INSN_LABEL
-#undef LABEL_IS_SC
-  END_INSN(freezestring);}}}
 INSN_ENTRY(toregexp){
 {
   VALUE val;
@@ -628,18 +605,18 @@ INSN_ENTRY(toregexp){
   COLLECT_USAGE_OPERAND(BIN(toregexp), 0, opt);
   COLLECT_USAGE_OPERAND(BIN(toregexp), 1, cnt);
 {
-#line 418 "insns.def"
+#line 406 "insns.def"
     VALUE rb_reg_new_ary(VALUE ary, int options);
     rb_num_t i;
     const VALUE ary = rb_ary_tmp_new(cnt);
     for (i = 0; i < cnt; i++) {
-	rb_ary_store(ary, cnt-i-1, TOPN(i));
+        rb_ary_store(ary, cnt-i-1, TOPN(i));
     }
     POPN(cnt);
     val = rb_reg_new_ary(ary, (int)opt);
     rb_ary_clear(ary);
 
-#line 643 "vm.inc"
+#line 620 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_toregexp
@@ -662,11 +639,11 @@ INSN_ENTRY(newarray){
   COLLECT_USAGE_INSN(BIN(newarray));
   COLLECT_USAGE_OPERAND(BIN(newarray), 0, num);
 {
-#line 440 "insns.def"
+#line 428 "insns.def"
     val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
     POPN(num);
 
-#line 670 "vm.inc"
+#line 647 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newarray
@@ -689,10 +666,10 @@ INSN_ENTRY(duparray){
   COLLECT_USAGE_INSN(BIN(duparray));
   COLLECT_USAGE_OPERAND(BIN(duparray), 0, ary);
 {
-#line 455 "insns.def"
+#line 443 "insns.def"
     val = rb_ary_resurrect(ary);
 
-#line 696 "vm.inc"
+#line 673 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_duparray
@@ -717,10 +694,10 @@ INSN_ENTRY(expandarray){
   COLLECT_USAGE_OPERAND(BIN(expandarray), 0, num);
   COLLECT_USAGE_OPERAND(BIN(expandarray), 1, flag);
 {
-#line 483 "insns.def"
+#line 464 "insns.def"
     vm_expandarray(GET_CFP(), ary, num, (int)flag);
 
-#line 724 "vm.inc"
+#line 701 "vm.inc"
 #undef CURRENT_INSN_expandarray
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -742,7 +719,7 @@ INSN_ENTRY(concatarray){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(concatarray));
 {
-#line 497 "insns.def"
+#line 478 "insns.def"
     const VALUE ary2 = ary2st;
     VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
     VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");
@@ -760,7 +737,7 @@ INSN_ENTRY(concatarray){
     }
     ary = rb_ary_concat(tmp1, tmp2);
 
-#line 764 "vm.inc"
+#line 741 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(ary);
 #undef CURRENT_INSN_concatarray
@@ -784,7 +761,7 @@ INSN_ENTRY(splatarray){
   COLLECT_USAGE_INSN(BIN(splatarray));
   COLLECT_USAGE_OPERAND(BIN(splatarray), 0, flag);
 {
-#line 526 "insns.def"
+#line 507 "insns.def"
     VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
     if (NIL_P(tmp)) {
 	tmp = rb_ary_new3(1, ary);
@@ -794,7 +771,7 @@ INSN_ENTRY(splatarray){
     }
     obj = tmp;
 
-#line 798 "vm.inc"
+#line 775 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(obj);
 #undef CURRENT_INSN_splatarray
@@ -817,10 +794,12 @@ INSN_ENTRY(newhash){
   COLLECT_USAGE_INSN(BIN(newhash));
   COLLECT_USAGE_OPERAND(BIN(newhash), 0, num);
 {
-#line 548 "insns.def"
+#line 529 "insns.def"
     rb_num_t i;
 
-    RUBY_DTRACE_CREATE_HOOK(HASH, num);
+    if(RUBY_DTRACE_HASH_CREATE_ENABLED()) {
+	RUBY_DTRACE_HASH_CREATE(num, rb_sourcefile(), rb_sourceline());
+    }
 
     val = rb_hash_new();
 
@@ -831,7 +810,7 @@ INSN_ENTRY(newhash){
     }
     POPN(num);
 
-#line 835 "vm.inc"
+#line 814 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newhash
@@ -856,10 +835,10 @@ INSN_ENTRY(newrange){
   COLLECT_USAGE_INSN(BIN(newrange));
   COLLECT_USAGE_OPERAND(BIN(newrange), 0, flag);
 {
-#line 573 "insns.def"
+#line 556 "insns.def"
     val = rb_range_new(low, high, (int)flag);
 
-#line 863 "vm.inc"
+#line 842 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newrange
@@ -881,11 +860,11 @@ INSN_ENTRY(pop){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(pop));
 {
-#line 591 "insns.def"
+#line 574 "insns.def"
     (void)val;
     /* none */
 
-#line 889 "vm.inc"
+#line 868 "vm.inc"
 #undef CURRENT_INSN_pop
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -907,10 +886,10 @@ INSN_ENTRY(dup){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(dup));
 {
-#line 606 "insns.def"
+#line 589 "insns.def"
     val1 = val2 = val;
 
-#line 914 "vm.inc"
+#line 893 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 2);
   PUSH(val1);
   PUSH(val2);
@@ -933,7 +912,7 @@ INSN_ENTRY(dupn){
   COLLECT_USAGE_INSN(BIN(dupn));
   COLLECT_USAGE_OPERAND(BIN(dupn), 0, n);
 {
-#line 620 "insns.def"
+#line 603 "insns.def"
     rb_num_t i;
     VALUE *sp = STACK_ADDR_FROM_TOP(n);
     for (i = 0; i < n; i++) {
@@ -941,7 +920,7 @@ INSN_ENTRY(dupn){
     }
     INC_SP(n);
 
-#line 945 "vm.inc"
+#line 924 "vm.inc"
 #undef CURRENT_INSN_dupn
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -962,10 +941,10 @@ INSN_ENTRY(swap){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(swap));
 {
-#line 640 "insns.def"
+#line 623 "insns.def"
     /* none */
 
-#line 969 "vm.inc"
+#line 948 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 2);
   PUSH(obj);
   PUSH(val);
@@ -974,37 +953,6 @@ INSN_ENTRY(swap){
 #undef INSN_LABEL
 #undef LABEL_IS_SC
   END_INSN(swap);}}}
-INSN_ENTRY(reverse){
-{
-  rb_num_t n = (rb_num_t)GET_OPERAND(1);
-
-  DEBUG_ENTER_INSN("reverse");
-  ADD_PC(1+1);
-  PREFETCH(GET_PC());
-  #define CURRENT_INSN_reverse 1
-  #define INSN_IS_SC()     0
-  #define INSN_LABEL(lab)  LABEL_reverse_##lab
-  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
-  COLLECT_USAGE_INSN(BIN(reverse));
-  COLLECT_USAGE_OPERAND(BIN(reverse), 0, n);
-{
-#line 654 "insns.def"
-    rb_num_t i;
-    VALUE *sp = STACK_ADDR_FROM_TOP(n);
-
-    for (i=0; i<n/2; i++) {
-	VALUE v0 = sp[i];
-	VALUE v1 = TOPN(i);
-	sp[i] = v1;
-	TOPN(i) = v0;
-    }
-
-#line 1003 "vm.inc"
-#undef CURRENT_INSN_reverse
-#undef INSN_IS_SC
-#undef INSN_LABEL
-#undef LABEL_IS_SC
-  END_INSN(reverse);}}}
 INSN_ENTRY(reput){
 {
 
@@ -1019,10 +967,10 @@ INSN_ENTRY(reput){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(reput));
 {
-#line 676 "insns.def"
+#line 637 "insns.def"
     /* none */
 
-#line 1026 "vm.inc"
+#line 974 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_reput
@@ -1045,10 +993,10 @@ INSN_ENTRY(topn){
   COLLECT_USAGE_INSN(BIN(topn));
   COLLECT_USAGE_OPERAND(BIN(topn), 0, n);
 {
-#line 690 "insns.def"
+#line 651 "insns.def"
     val = TOPN(n);
 
-#line 1052 "vm.inc"
+#line 1000 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_topn
@@ -1071,10 +1019,10 @@ INSN_ENTRY(setn){
   COLLECT_USAGE_INSN(BIN(setn));
   COLLECT_USAGE_OPERAND(BIN(setn), 0, n);
 {
-#line 704 "insns.def"
+#line 665 "insns.def"
     TOPN(n-1) = val;
 
-#line 1078 "vm.inc"
+#line 1026 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_setn
@@ -1096,10 +1044,10 @@ INSN_ENTRY(adjuststack){
   COLLECT_USAGE_INSN(BIN(adjuststack));
   COLLECT_USAGE_OPERAND(BIN(adjuststack), 0, n);
 {
-#line 718 "insns.def"
+#line 679 "insns.def"
     DEC_SP(n);
 
-#line 1103 "vm.inc"
+#line 1051 "vm.inc"
 #undef CURRENT_INSN_adjuststack
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1125,10 +1073,105 @@ INSN_ENTRY(defined){
   COLLECT_USAGE_OPERAND(BIN(defined), 1, obj);
   COLLECT_USAGE_OPERAND(BIN(defined), 2, needstr);
 {
-#line 737 "insns.def"
-    val = vm_defined(th, GET_CFP(), op_type, obj, needstr, v);
+#line 698 "insns.def"
+    VALUE klass;
+    enum defined_type expr_type = 0;
+    enum defined_type type = (enum defined_type)op_type;
+
+    val = Qnil;
+
+    switch (type) {
+      case DEFINED_IVAR:
+	if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
+	    expr_type = DEFINED_IVAR;
+	}
+	break;
+      case DEFINED_IVAR2:
+	klass = vm_get_cbase(GET_ISEQ(), GET_EP());
+	break;
+      case DEFINED_GVAR:
+	if (rb_gvar_defined(rb_global_entry(SYM2ID(obj)))) {
+	    expr_type = DEFINED_GVAR;
+	}
+	break;
+      case DEFINED_CVAR: {
+	NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
+	klass = vm_get_cvar_base(cref, GET_CFP());
+	if (rb_cvar_defined(klass, SYM2ID(obj))) {
+	    expr_type = DEFINED_CVAR;
+	}
+	break;
+      }
+      case DEFINED_CONST:
+	klass = v;
+	if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
+	    expr_type = DEFINED_CONST;
+	}
+	break;
+      case DEFINED_FUNC:
+	klass = CLASS_OF(v);
+	if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
+	    expr_type = DEFINED_METHOD;
+	}
+	break;
+      case DEFINED_METHOD:{
+	VALUE klass = CLASS_OF(v);
+	const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj), 0);
+
+	if (me) {
+	    if (!(me->flag & NOEX_PRIVATE) &&
+		!((me->flag & NOEX_PROTECTED) && !rb_obj_is_kind_of(GET_SELF(), rb_class_real(klass)))) {
+		expr_type = DEFINED_METHOD;
+	    }
+	}
+	else {
+	    VALUE args[2];
+	    VALUE r;
 
-#line 1132 "vm.inc"
+	    args[0] = obj; args[1] = Qfalse;
+	    r = rb_check_funcall(v, idRespond_to_missing, 2, args);
+	    if (r != Qundef && RTEST(r))
+		expr_type = DEFINED_METHOD;
+	}
+	break;
+      }
+      case DEFINED_YIELD:
+	if (GET_BLOCK_PTR()) {
+	    expr_type = DEFINED_YIELD;
+	}
+	break;
+      case DEFINED_ZSUPER:{
+	rb_call_info_t cit;
+	if (vm_search_superclass(GET_CFP(), GET_ISEQ(), Qnil, &cit) == 0) {
+	    VALUE klass = cit.klass;
+	    ID id = cit.mid;
+	    if (rb_method_boundp(klass, id, 0)) {
+		expr_type = DEFINED_ZSUPER;
+	    }
+	}
+	break;
+      }
+      case DEFINED_REF:{
+	val = vm_getspecial(th, GET_LEP(), Qfalse, FIX2INT(obj));
+	if (val != Qnil) {
+	    expr_type = DEFINED_GVAR;
+	}
+	break;
+      }
+      default:
+	rb_bug("unimplemented defined? type (VM)");
+	break;
+    }
+    if (expr_type != 0) {
+	if (needstr != Qfalse) {
+	    val = rb_iseq_defined_string(expr_type);
+	}
+	else {
+	    val = Qtrue;
+	}
+    }
+
+#line 1175 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_defined
@@ -1153,7 +1196,7 @@ INSN_ENTRY(checkmatch){
   COLLECT_USAGE_INSN(BIN(checkmatch));
   COLLECT_USAGE_OPERAND(BIN(checkmatch), 0, flag);
 {
-#line 756 "insns.def"
+#line 812 "insns.def"
     enum vm_check_match_type checkmatch_type =
       (enum vm_check_match_type)(flag & VM_CHECKMATCH_TYPE_MASK);
     result = Qfalse;
@@ -1173,7 +1216,7 @@ INSN_ENTRY(checkmatch){
 	}
     }
 
-#line 1177 "vm.inc"
+#line 1220 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(result);
 #undef CURRENT_INSN_checkmatch
@@ -1198,7 +1241,7 @@ INSN_ENTRY(checkkeyword){
   COLLECT_USAGE_OPERAND(BIN(checkkeyword), 0, kw_bits_index);
   COLLECT_USAGE_OPERAND(BIN(checkkeyword), 1, keyword_index);
 {
-#line 787 "insns.def"
+#line 843 "insns.def"
     const VALUE *ep = GET_EP();
     const VALUE kw_bits = *(ep - kw_bits_index);
 
@@ -1207,11 +1250,11 @@ INSN_ENTRY(checkkeyword){
 	ret = (bits & (0x01 << keyword_index)) ? Qfalse : Qtrue;
     }
     else {
-	VM_ASSERT(RB_TYPE_P(kw_bits, T_HASH));
+	assert(RB_TYPE_P(kw_bits, T_HASH));
 	ret = rb_hash_has_key(kw_bits, INT2FIX(keyword_index)) ? Qfalse : Qtrue;
     }
 
-#line 1215 "vm.inc"
+#line 1258 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_checkkeyword
@@ -1233,34 +1276,34 @@ INSN_ENTRY(trace){
   COLLECT_USAGE_INSN(BIN(trace));
   COLLECT_USAGE_OPERAND(BIN(trace), 0, nf);
 {
-#line 811 "insns.def"
+#line 867 "insns.def"
     rb_event_flag_t flag = (rb_event_flag_t)nf;
 
     if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() ||
-	RUBY_DTRACE_METHOD_RETURN_ENABLED() ||
-	RUBY_DTRACE_CMETHOD_ENTRY_ENABLED() ||
-	RUBY_DTRACE_CMETHOD_RETURN_ENABLED()) {
-
-	switch (flag) {
-	  case RUBY_EVENT_CALL:
-	    RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0);
-	    break;
-	  case RUBY_EVENT_C_CALL:
-	    RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0);
-	    break;
-	  case RUBY_EVENT_RETURN:
-	    RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0);
-	    break;
-	  case RUBY_EVENT_C_RETURN:
-	    RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0);
-	    break;
-	}
+        RUBY_DTRACE_METHOD_RETURN_ENABLED() ||
+        RUBY_DTRACE_CMETHOD_ENTRY_ENABLED() ||
+        RUBY_DTRACE_CMETHOD_RETURN_ENABLED()) {
+
+        switch(flag) {
+          case RUBY_EVENT_CALL:
+            RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0);
+            break;
+          case RUBY_EVENT_C_CALL:
+            RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0);
+            break;
+          case RUBY_EVENT_RETURN:
+            RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0);
+            break;
+          case RUBY_EVENT_C_RETURN:
+            RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0);
+            break;
+        }
     }
 
     EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
 		    (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
 
-#line 1264 "vm.inc"
+#line 1307 "vm.inc"
 #undef CURRENT_INSN_trace
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1287,8 +1330,10 @@ INSN_ENTRY(defineclass){
   COLLECT_USAGE_OPERAND(BIN(defineclass), 1, class_iseq);
   COLLECT_USAGE_OPERAND(BIN(defineclass), 2, flags);
 {
-#line 857 "insns.def"
+#line 913 "insns.def"
     VALUE klass;
+    VALUE class_iseq_val = class_iseq->self;
+    rb_iseq_t *orig_class_iseq = NULL;
     rb_vm_defineclass_type_t type = VM_DEFINECLASS_TYPE(flags);
 
     switch (type) {
@@ -1297,8 +1342,8 @@ INSN_ENTRY(defineclass){
 
 	if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) &&
 	    !RB_TYPE_P(super, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)",
-		     rb_obj_class(super));
+	    rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		     rb_obj_classname(super));
 	}
 
 	vm_check_if_namespace(cbase);
@@ -1310,7 +1355,7 @@ INSN_ENTRY(defineclass){
 	    klass = VM_DEFINECLASS_SCOPED_P(flags) ?
 		rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
 	    if (!RB_TYPE_P(klass, T_CLASS)) {
-		rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id));
+		rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
 	    }
 
 	    if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) {
@@ -1318,8 +1363,8 @@ INSN_ENTRY(defineclass){
 		tmp = rb_class_real(RCLASS_SUPER(klass));
 
 		if (tmp != super) {
-		    rb_raise(rb_eTypeError, "superclass mismatch for class %"PRIsVALUE"",
-			     rb_id2str(id));
+		    rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+			     rb_id2name(id));
 		}
 	    }
 	}
@@ -1337,7 +1382,18 @@ INSN_ENTRY(defineclass){
       case VM_DEFINECLASS_TYPE_SINGLETON_CLASS:
 	/* val is dummy.  classdef returns class scope value */
 	/* super is dummy */
-	klass = rb_singleton_class(cbase);
+	{
+	    klass = rb_singleton_class(cbase);
+
+	    /* Copy iseq to duplicate cref_stack place.
+	     * This is ad-hoc solution for [Bug #10871].
+	     * and this does not solve more complicated source code with singleton class.
+	     * If you need to solve everything, use Ruby 2.3 and later.
+	     */
+	    orig_class_iseq = class_iseq;
+	    class_iseq_val = rb_iseq_clone(class_iseq->self, cbase);
+	    GetISeqPtr(class_iseq_val, class_iseq);
+	}
 	break;
       case VM_DEFINECLASS_TYPE_MODULE:
 	/* val is dummy.  classdef returns class scope value */
@@ -1351,7 +1407,7 @@ INSN_ENTRY(defineclass){
 		rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
 	    /* already exist */
 	    if (!RB_TYPE_P(klass, T_MODULE)) {
-		rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a module", rb_id2str(id));
+		rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
 	    }
 	}
 	else {
@@ -1365,19 +1421,23 @@ INSN_ENTRY(defineclass){
 	rb_bug("unknown defineclass type: %d", (int)type);
     }
 
-    rb_iseq_check(class_iseq);
+    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
+    if (orig_class_iseq) {
+	COPY_CREF(orig_class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
+    }
 
     /* enter scope */
-    vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS | VM_ENV_FLAG_LOCAL, klass,
-		  GET_BLOCK_HANDLER(),
-		  (VALUE)vm_cref_push(th, klass, NULL, FALSE),
-		  class_iseq->body->iseq_encoded, GET_SP(),
-		  class_iseq->body->local_table_size,
-		  class_iseq->body->stack_max);
+    vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS,
+		  klass, 0, VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()),
+		  class_iseq->iseq_encoded, GET_SP(),
+		  class_iseq->local_size, 0, class_iseq->stack_max);
+
+    RB_GC_GUARD(class_iseq_val);
+
     RESTORE_REGS();
     NEXT_INSN();
 
-#line 1381 "vm.inc"
+#line 1441 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_defineclass
@@ -1388,12 +1448,10 @@ INSN_ENTRY(defineclass){
 INSN_ENTRY(send){
 {
   VALUE val;
-  ISEQ blockiseq = (ISEQ)GET_OPERAND(3);
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("send");
-  ADD_PC(1+3);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   #define CURRENT_INSN_send 1
   #define INSN_IS_SC()     0
@@ -1401,17 +1459,14 @@ INSN_ENTRY(send){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(send));
   COLLECT_USAGE_OPERAND(BIN(send), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(send), 1, cc);
-  COLLECT_USAGE_OPERAND(BIN(send), 2, blockiseq);
 {
-#line 963 "insns.def"
-    struct rb_calling_info calling;
-
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, FALSE);
-    vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
-    CALL_METHOD(&calling, ci, cc);
+#line 1036 "insns.def"
+    ci->argc = ci->orig_argc;
+    vm_caller_setup_arg_block(th, reg_cfp, ci, FALSE);
+    vm_search_method(ci, ci->recv = TOPN(ci->argc));
+    CALL_METHOD(ci);
 
-#line 1415 "vm.inc"
+#line 1470 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_send
@@ -1434,7 +1489,7 @@ INSN_ENTRY(opt_str_freeze){
   COLLECT_USAGE_INSN(BIN(opt_str_freeze));
   COLLECT_USAGE_OPERAND(BIN(opt_str_freeze), 0, str);
 {
-#line 976 "insns.def"
+#line 1048 "insns.def"
     if (BASIC_OP_UNREDEFINED_P(BOP_FREEZE, STRING_REDEFINED_OP_FLAG)) {
 	val = str;
     }
@@ -1442,7 +1497,7 @@ INSN_ENTRY(opt_str_freeze){
 	val = rb_funcall(rb_str_resurrect(str), idFreeze, 0);
     }
 
-#line 1446 "vm.inc"
+#line 1501 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_str_freeze
@@ -1450,116 +1505,13 @@ INSN_ENTRY(opt_str_freeze){
 #undef INSN_LABEL
 #undef LABEL_IS_SC
   END_INSN(opt_str_freeze);}}}
-INSN_ENTRY(opt_newarray_max){
-{
-  VALUE val;
-  rb_num_t num = (rb_num_t)GET_OPERAND(1);
-
-  DEBUG_ENTER_INSN("opt_newarray_max");
-  ADD_PC(1+1);
-  PREFETCH(GET_PC());
-  #define CURRENT_INSN_opt_newarray_max 1
-  #define INSN_IS_SC()     0
-  #define INSN_LABEL(lab)  LABEL_opt_newarray_max_##lab
-  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
-  COLLECT_USAGE_INSN(BIN(opt_newarray_max));
-  COLLECT_USAGE_OPERAND(BIN(opt_newarray_max), 0, num);
-{
-#line 990 "insns.def"
-#define id_cmp  idCmp
-    if (BASIC_OP_UNREDEFINED_P(BOP_MAX, ARRAY_REDEFINED_OP_FLAG)) {
-	if (num == 0) {
-	    val = Qnil;
-	}
-	else {
-	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
-	    rb_num_t i = num - 1;
-	    result = TOPN(i);
-	    while (i-- > 0) {
-		const VALUE v = TOPN(i);
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
-		    result = v;
-		}
-	    }
-	    val = result == Qundef ? Qnil : result;
-	}
-	POPN(num);
-    }
-    else {
-	VALUE ary = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-	val = rb_funcall(ary, idMax, 0);
-	POPN(num);
-    }
-#undef id_cmp
-
-#line 1497 "vm.inc"
-  CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
-  PUSH(val);
-#undef CURRENT_INSN_opt_newarray_max
-#undef INSN_IS_SC
-#undef INSN_LABEL
-#undef LABEL_IS_SC
-  END_INSN(opt_newarray_max);}}}
-INSN_ENTRY(opt_newarray_min){
-{
-  VALUE val;
-  rb_num_t num = (rb_num_t)GET_OPERAND(1);
-
-  DEBUG_ENTER_INSN("opt_newarray_min");
-  ADD_PC(1+1);
-  PREFETCH(GET_PC());
-  #define CURRENT_INSN_opt_newarray_min 1
-  #define INSN_IS_SC()     0
-  #define INSN_LABEL(lab)  LABEL_opt_newarray_min_##lab
-  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
-  COLLECT_USAGE_INSN(BIN(opt_newarray_min));
-  COLLECT_USAGE_OPERAND(BIN(opt_newarray_min), 0, num);
-{
-#line 1024 "insns.def"
-#define id_cmp  idCmp
-    if (BASIC_OP_UNREDEFINED_P(BOP_MIN, ARRAY_REDEFINED_OP_FLAG)) {
-	if (num == 0) {
-	    val = Qnil;
-	}
-	else {
-	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
-	    rb_num_t i = num - 1;
-	    result = TOPN(i);
-	    while (i-- > 0) {
-		const VALUE v = TOPN(i);
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
-		    result = v;
-		}
-	    }
-	    val = result == Qundef ? Qnil : result;
-	}
-	POPN(num);
-    }
-    else {
-	VALUE ary = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-	val = rb_funcall(ary, idMin, 0);
-	POPN(num);
-    }
-#undef id_cmp
-
-#line 1548 "vm.inc"
-  CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
-  PUSH(val);
-#undef CURRENT_INSN_opt_newarray_min
-#undef INSN_IS_SC
-#undef INSN_LABEL
-#undef LABEL_IS_SC
-  END_INSN(opt_newarray_min);}}}
 INSN_ENTRY(opt_send_without_block){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("opt_send_without_block");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   #define CURRENT_INSN_opt_send_without_block 1
   #define INSN_IS_SC()     0
@@ -1567,15 +1519,13 @@ INSN_ENTRY(opt_send_without_block){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_send_without_block));
   COLLECT_USAGE_OPERAND(BIN(opt_send_without_block), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_send_without_block), 1, cc);
 {
-#line 1063 "insns.def"
-    struct rb_calling_info calling;
-    calling.block_handler = VM_BLOCK_HANDLER_NONE;
-    vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
-    CALL_METHOD(&calling, ci, cc);
+#line 1067 "insns.def"
+    ci->argc = ci->orig_argc;
+    vm_search_method(ci, ci->recv = TOPN(ci->argc));
+    CALL_METHOD(ci);
 
-#line 1579 "vm.inc"
+#line 1529 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_send_without_block
@@ -1586,12 +1536,10 @@ INSN_ENTRY(opt_send_without_block){
 INSN_ENTRY(invokesuper){
 {
   VALUE val;
-  ISEQ blockiseq = (ISEQ)GET_OPERAND(3);
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("invokesuper");
-  ADD_PC(1+3);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   #define CURRENT_INSN_invokesuper 1
   #define INSN_IS_SC()     0
@@ -1599,19 +1547,15 @@ INSN_ENTRY(invokesuper){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(invokesuper));
   COLLECT_USAGE_OPERAND(BIN(invokesuper), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(invokesuper), 1, cc);
-  COLLECT_USAGE_OPERAND(BIN(invokesuper), 2, blockiseq);
 {
-#line 1080 "insns.def"
-    struct rb_calling_info calling;
-    calling.argc = ci->orig_argc;
-
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, TRUE);
-    calling.recv = GET_SELF();
-    vm_search_super_method(th, GET_CFP(), &calling, ci, cc);
-    CALL_METHOD(&calling, ci, cc);
+#line 1083 "insns.def"
+    ci->argc = ci->orig_argc;
+    vm_caller_setup_arg_block(th, reg_cfp, ci, TRUE);
+    ci->recv = GET_SELF();
+    vm_search_super_method(th, GET_CFP(), ci);
+    CALL_METHOD(ci);
 
-#line 1615 "vm.inc"
+#line 1559 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_invokesuper
@@ -1634,19 +1578,17 @@ INSN_ENTRY(invokeblock){
   COLLECT_USAGE_INSN(BIN(invokeblock));
   COLLECT_USAGE_OPERAND(BIN(invokeblock), 0, ci);
 {
-#line 1100 "insns.def"
-    struct rb_calling_info calling;
-    calling.argc = ci->orig_argc;
-    calling.block_handler = VM_BLOCK_HANDLER_NONE;
-    calling.recv = GET_SELF();
-
-    val = vm_invoke_block(th, GET_CFP(), &calling, ci);
+#line 1101 "insns.def"
+    ci->argc = ci->orig_argc;
+    ci->blockptr = 0;
+    ci->recv = GET_SELF();
+    val = vm_invoke_block(th, GET_CFP(), ci);
     if (val == Qundef) {
 	RESTORE_REGS();
 	NEXT_INSN();
     }
 
-#line 1650 "vm.inc"
+#line 1592 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_invokeblock
@@ -1668,18 +1610,19 @@ INSN_ENTRY(leave){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(leave));
 {
-#line 1123 "insns.def"
+#line 1122 "insns.def"
     if (OPT_CHECKED_RUN) {
-	const VALUE *const bp = vm_base_ptr(reg_cfp);
-	if (reg_cfp->sp != bp) {
+	if (reg_cfp->sp != vm_base_ptr(reg_cfp)) {
 	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
-		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, bp));
+		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, vm_base_ptr(reg_cfp)));
 	}
     }
 
     RUBY_VM_CHECK_INTS(th);
 
-    if (vm_pop_frame(th, GET_CFP(), GET_EP())) {
+    if (UNLIKELY(VM_FRAME_TYPE_FINISH_P(GET_CFP()))) {
+	vm_pop_frame(th);
+
 #if OPT_CALL_THREADED_CODE
 	th->retval = val;
 	return 0;
@@ -1688,10 +1631,11 @@ INSN_ENTRY(leave){
 #endif
     }
     else {
+	vm_pop_frame(th);
 	RESTORE_REGS();
     }
 
-#line 1695 "vm.inc"
+#line 1639 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_leave
@@ -1715,13 +1659,13 @@ INSN_ENTRY(throw){
   COLLECT_USAGE_INSN(BIN(throw));
   COLLECT_USAGE_OPERAND(BIN(throw), 0, throw_state);
 {
-#line 1161 "insns.def"
+#line 1162 "insns.def"
     RUBY_VM_CHECK_INTS(th);
     val = vm_throw(th, GET_CFP(), throw_state, throwobj);
     THROW_EXCEPTION(val);
     /* unreachable */
 
-#line 1725 "vm.inc"
+#line 1669 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_throw
@@ -1743,11 +1687,11 @@ INSN_ENTRY(jump){
   COLLECT_USAGE_INSN(BIN(jump));
   COLLECT_USAGE_OPERAND(BIN(jump), 0, dst);
 {
-#line 1182 "insns.def"
+#line 1183 "insns.def"
     RUBY_VM_CHECK_INTS(th);
     JUMP(dst);
 
-#line 1751 "vm.inc"
+#line 1695 "vm.inc"
 #undef CURRENT_INSN_jump
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1768,13 +1712,13 @@ INSN_ENTRY(branchif){
   COLLECT_USAGE_INSN(BIN(branchif));
   COLLECT_USAGE_OPERAND(BIN(branchif), 0, dst);
 {
-#line 1197 "insns.def"
+#line 1198 "insns.def"
     if (RTEST(val)) {
 	RUBY_VM_CHECK_INTS(th);
 	JUMP(dst);
     }
 
-#line 1778 "vm.inc"
+#line 1722 "vm.inc"
 #undef CURRENT_INSN_branchif
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1795,45 +1739,18 @@ INSN_ENTRY(branchunless){
   COLLECT_USAGE_INSN(BIN(branchunless));
   COLLECT_USAGE_OPERAND(BIN(branchunless), 0, dst);
 {
-#line 1214 "insns.def"
+#line 1215 "insns.def"
     if (!RTEST(val)) {
 	RUBY_VM_CHECK_INTS(th);
 	JUMP(dst);
     }
 
-#line 1805 "vm.inc"
+#line 1749 "vm.inc"
 #undef CURRENT_INSN_branchunless
 #undef INSN_IS_SC
 #undef INSN_LABEL
 #undef LABEL_IS_SC
   END_INSN(branchunless);}}}
-INSN_ENTRY(branchnil){
-{
-  OFFSET dst = (OFFSET)GET_OPERAND(1);
-  VALUE val = TOPN(0);
-  DEBUG_ENTER_INSN("branchnil");
-  ADD_PC(1+1);
-  PREFETCH(GET_PC());
-  POPN(1);
-  #define CURRENT_INSN_branchnil 1
-  #define INSN_IS_SC()     0
-  #define INSN_LABEL(lab)  LABEL_branchnil_##lab
-  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
-  COLLECT_USAGE_INSN(BIN(branchnil));
-  COLLECT_USAGE_OPERAND(BIN(branchnil), 0, dst);
-{
-#line 1231 "insns.def"
-    if (NIL_P(val)) {
-	RUBY_VM_CHECK_INTS(th);
-	JUMP(dst);
-    }
-
-#line 1832 "vm.inc"
-#undef CURRENT_INSN_branchnil
-#undef INSN_IS_SC
-#undef INSN_LABEL
-#undef LABEL_IS_SC
-  END_INSN(branchnil);}}}
 INSN_ENTRY(getinlinecache){
 {
   VALUE val;
@@ -1851,9 +1768,8 @@ INSN_ENTRY(getinlinecache){
   COLLECT_USAGE_OPERAND(BIN(getinlinecache), 0, dst);
   COLLECT_USAGE_OPERAND(BIN(getinlinecache), 1, ic);
 {
-#line 1253 "insns.def"
-    if (ic->ic_serial == GET_GLOBAL_CONSTANT_STATE() &&
-	(ic->ic_cref == NULL || ic->ic_cref == rb_vm_get_cref(GET_EP()))) {
+#line 1237 "insns.def"
+    if (ic->ic_serial == GET_GLOBAL_CONSTANT_STATE()) {
 	val = ic->ic_value.value;
 	JUMP(dst);
     }
@@ -1862,7 +1778,7 @@ INSN_ENTRY(getinlinecache){
 	val = Qnil;
     }
 
-#line 1866 "vm.inc"
+#line 1782 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getinlinecache
@@ -1885,14 +1801,15 @@ INSN_ENTRY(setinlinecache){
   COLLECT_USAGE_INSN(BIN(setinlinecache));
   COLLECT_USAGE_OPERAND(BIN(setinlinecache), 0, ic);
 {
-#line 1275 "insns.def"
-    VM_ASSERT(ic->ic_value.value != Qundef);
+#line 1258 "insns.def"
+    if (ic->ic_value.value == Qundef) {
+	rb_iseq_add_mark_object(GET_ISEQ(), val);
+    }
     ic->ic_value.value = val;
     ic->ic_serial = GET_GLOBAL_CONSTANT_STATE() - ruby_vm_const_missing_count;
-    ic->ic_cref = vm_get_const_key_cref(GET_EP());
     ruby_vm_const_missing_count = 0;
 
-#line 1896 "vm.inc"
+#line 1813 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_setinlinecache
@@ -1917,7 +1834,7 @@ INSN_ENTRY(once){
   COLLECT_USAGE_OPERAND(BIN(once), 0, iseq);
   COLLECT_USAGE_OPERAND(BIN(once), 1, ic);
 {
-#line 1293 "insns.def"
+#line 1277 "insns.def"
     union iseq_inline_storage_entry *is = (union iseq_inline_storage_entry *)ic;
 
 #define RUNNING_THREAD_ONCE_DONE ((rb_thread_t *)(0x1))
@@ -1943,7 +1860,7 @@ INSN_ENTRY(once){
 	goto retry;
     }
 
-#line 1947 "vm.inc"
+#line 1864 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_once
@@ -1968,7 +1885,7 @@ INSN_ENTRY(opt_case_dispatch){
   COLLECT_USAGE_OPERAND(BIN(opt_case_dispatch), 0, hash);
   COLLECT_USAGE_OPERAND(BIN(opt_case_dispatch), 1, else_offset);
 {
-#line 1330 "insns.def"
+#line 1314 "insns.def"
     switch(TYPE(key)) {
       case T_FLOAT: {
 	double ival;
@@ -1976,20 +1893,15 @@ INSN_ENTRY(opt_case_dispatch){
 	    key = FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
 	}
       }
-      case T_TRUE: /* fall through */
-      case T_FALSE:
-      case T_NIL:
-      case T_SYMBOL:
+      case T_SYMBOL: /* fall through */
       case T_FIXNUM:
       case T_BIGNUM:
       case T_STRING:
 	if (BASIC_OP_UNREDEFINED_P(BOP_EQQ,
 				   SYMBOL_REDEFINED_OP_FLAG |
-				   INTEGER_REDEFINED_OP_FLAG |
+				   FIXNUM_REDEFINED_OP_FLAG |
 				   FLOAT_REDEFINED_OP_FLAG |
-				   NIL_REDEFINED_OP_FLAG    |
-				   TRUE_REDEFINED_OP_FLAG   |
-				   FALSE_REDEFINED_OP_FLAG  |
+				   BIGNUM_REDEFINED_OP_FLAG |
 				   STRING_REDEFINED_OP_FLAG)) {
 	    st_data_t val;
 	    if (st_lookup(RHASH_TBL_RAW(hash), key, &val)) {
@@ -2004,7 +1916,7 @@ INSN_ENTRY(opt_case_dispatch){
 	break;
     }
 
-#line 2008 "vm.inc"
+#line 1920 "vm.inc"
 #undef CURRENT_INSN_opt_case_dispatch
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -2013,12 +1925,11 @@ INSN_ENTRY(opt_case_dispatch){
 INSN_ENTRY(opt_plus){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_plus");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_plus 1
@@ -2027,20 +1938,29 @@ INSN_ENTRY(opt_plus){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_plus));
   COLLECT_USAGE_OPERAND(BIN(opt_plus), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_plus), 1, cc);
 {
-#line 1379 "insns.def"
+#line 1358 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_PLUS,INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_PLUS,FIXNUM_REDEFINED_OP_FLAG)) {
 	/* fixnum + fixnum */
 #ifndef LONG_LONG_VALUE
-	VALUE msb = (VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1);
-	val = recv - 1 + obj;
-	if ((~(recv ^ obj) & (recv ^ val)) & msb) {
-	    val = rb_int2big((SIGNED_VALUE)((val>>1) | (recv & msb)));
+	val = (recv + (obj & (~1)));
+	if ((~(recv ^ obj) & (recv ^ val)) &
+	    ((VALUE)0x01 << ((sizeof(VALUE) * CHAR_BIT) - 1))) {
+	    val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
+			      rb_int2big(FIX2LONG(obj)));
 	}
 #else
-	val = LONG2NUM(FIX2LONG(recv) + FIX2LONG(obj));
+	long a, b, c;
+	a = FIX2LONG(recv);
+	b = FIX2LONG(obj);
+	c = a + b;
+	if (FIXABLE(c)) {
+	    val = LONG2FIX(c);
+	}
+	else {
+	    val = rb_big_plus(rb_int2big(a), rb_int2big(b));
+	}
 #endif
     }
     else if (FLONUM_2_P(recv, obj) &&
@@ -2071,7 +1991,7 @@ INSN_ENTRY(opt_plus){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2075 "vm.inc"
+#line 1995 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_plus
@@ -2082,12 +2002,11 @@ INSN_ENTRY(opt_plus){
 INSN_ENTRY(opt_minus){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_minus");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_minus 1
@@ -2096,17 +2015,22 @@ INSN_ENTRY(opt_minus){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_minus));
   COLLECT_USAGE_OPERAND(BIN(opt_minus), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_minus), 1, cc);
 {
-#line 1432 "insns.def"
+#line 1421 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MINUS, INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_MINUS, FIXNUM_REDEFINED_OP_FLAG)) {
 	long a, b, c;
 
 	a = FIX2LONG(recv);
 	b = FIX2LONG(obj);
 	c = a - b;
-	val = LONG2NUM(c);
+
+	if (FIXABLE(c)) {
+	    val = LONG2FIX(c);
+	}
+	else {
+	    val = rb_big_minus(rb_int2big(a), rb_int2big(b));
+	}
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_MINUS, FLOAT_REDEFINED_OP_FLAG)) {
@@ -2129,7 +2053,7 @@ INSN_ENTRY(opt_minus){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2133 "vm.inc"
+#line 2057 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_minus
@@ -2140,12 +2064,11 @@ INSN_ENTRY(opt_minus){
 INSN_ENTRY(opt_mult){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_mult");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_mult 1
@@ -2154,12 +2077,25 @@ INSN_ENTRY(opt_mult){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_mult));
   COLLECT_USAGE_OPERAND(BIN(opt_mult), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_mult), 1, cc);
 {
-#line 1474 "insns.def"
+#line 1469 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MULT, INTEGER_REDEFINED_OP_FLAG)) {
-	val = rb_fix_mul_fix(recv, obj);
+	BASIC_OP_UNREDEFINED_P(BOP_MULT, FIXNUM_REDEFINED_OP_FLAG)) {
+	long a, b;
+
+	a = FIX2LONG(recv);
+	if (a == 0) {
+	    val = recv;
+	}
+	else {
+	    b = FIX2LONG(obj);
+            if (MUL_OVERFLOW_FIXNUM_P(a, b)) {
+		val = rb_big_mul(rb_int2big(a), rb_int2big(b));
+            }
+            else {
+		val = LONG2FIX(a * b);
+            }
+	}
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
@@ -2181,7 +2117,7 @@ INSN_ENTRY(opt_mult){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2185 "vm.inc"
+#line 2121 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_mult
@@ -2192,12 +2128,11 @@ INSN_ENTRY(opt_mult){
 INSN_ENTRY(opt_div){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_div");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_div 1
@@ -2206,13 +2141,38 @@ INSN_ENTRY(opt_div){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_div));
   COLLECT_USAGE_OPERAND(BIN(opt_div), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_div), 1, cc);
 {
-#line 1510 "insns.def"
+#line 1519 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_DIV, INTEGER_REDEFINED_OP_FLAG)) {
-	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
-	val = rb_fix_div_fix(recv, obj);
+	BASIC_OP_UNREDEFINED_P(BOP_DIV, FIXNUM_REDEFINED_OP_FLAG)) {
+	long x, y, div;
+
+	x = FIX2LONG(recv);
+	y = FIX2LONG(obj);
+	{
+	    /* copied from numeric.c#fixdivmod */
+	    long mod;
+	    if (y == 0)
+		goto INSN_LABEL(normal_dispatch);
+	    if (y < 0) {
+		if (x < 0)
+		    div = -x / -y;
+		else
+		    div = -(x / -y);
+	    }
+	    else {
+		if (x < 0)
+		    div = -(-x / y);
+		else
+		    div = x / y;
+	    }
+	    mod = x - div * y;
+	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+		mod += y;
+		div -= 1;
+	    }
+	}
+	val = LONG2NUM(div);
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
@@ -2234,7 +2194,7 @@ INSN_ENTRY(opt_div){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2238 "vm.inc"
+#line 2198 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_div
@@ -2245,12 +2205,11 @@ INSN_ENTRY(opt_div){
 INSN_ENTRY(opt_mod){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_mod");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_mod 1
@@ -2259,13 +2218,42 @@ INSN_ENTRY(opt_mod){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_mod));
   COLLECT_USAGE_OPERAND(BIN(opt_mod), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_mod), 1, cc);
 {
-#line 1547 "insns.def"
+#line 1582 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MOD, INTEGER_REDEFINED_OP_FLAG )) {
-	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
-	val = rb_fix_mod_fix(recv, obj);
+	BASIC_OP_UNREDEFINED_P(BOP_MOD, FIXNUM_REDEFINED_OP_FLAG )) {
+	long x, y;
+
+	x = FIX2LONG(recv);
+	y = FIX2LONG(obj);
+	if (x > 0 && y > 0) {
+	    val = LONG2FIX(x % y);
+	}
+	else {
+	    /* copied from numeric.c#fixdivmod */
+	    long div, mod;
+
+	    if (y == 0)
+		goto INSN_LABEL(normal_dispatch);
+	    if (y < 0) {
+		if (x < 0)
+		    div = -x / -y;
+		else
+		    div = -(x / -y);
+	    }
+	    else {
+		if (x < 0)
+		    div = -(-x / y);
+		else
+		    div = x / y;
+	    }
+	    mod = x - div * y;
+	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+		mod += y;
+		div -= 1;
+	    }
+	    val = LONG2FIX(mod);
+	}
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
@@ -2287,7 +2275,7 @@ INSN_ENTRY(opt_mod){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2291 "vm.inc"
+#line 2279 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_mod
@@ -2298,12 +2286,11 @@ INSN_ENTRY(opt_mod){
 INSN_ENTRY(opt_eq){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_eq");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_eq 1
@@ -2312,10 +2299,9 @@ INSN_ENTRY(opt_eq){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_eq));
   COLLECT_USAGE_OPERAND(BIN(opt_eq), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_eq), 1, cc);
 {
-#line 1584 "insns.def"
-    val = opt_eq_func(recv, obj, ci, cc);
+#line 1649 "insns.def"
+    val = opt_eq_func(recv, obj, ci);
 
     if (val == Qundef) {
 	/* other */
@@ -2324,7 +2310,7 @@ INSN_ENTRY(opt_eq){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2328 "vm.inc"
+#line 2314 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_eq
@@ -2335,14 +2321,12 @@ INSN_ENTRY(opt_eq){
 INSN_ENTRY(opt_neq){
 {
   VALUE val;
-  CALL_CACHE cc_eq = (CALL_CACHE)GET_OPERAND(4);
-  CALL_INFO ci_eq = (CALL_INFO)GET_OPERAND(3);
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
+  CALL_INFO ci_eq = (CALL_INFO)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_neq");
-  ADD_PC(1+4);
+  ADD_PC(1+2);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_neq 1
@@ -2351,18 +2335,15 @@ INSN_ENTRY(opt_neq){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_neq));
   COLLECT_USAGE_OPERAND(BIN(opt_neq), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_neq), 1, cc);
-  COLLECT_USAGE_OPERAND(BIN(opt_neq), 2, ci_eq);
-  COLLECT_USAGE_OPERAND(BIN(opt_neq), 3, cc_eq);
+  COLLECT_USAGE_OPERAND(BIN(opt_neq), 1, ci_eq);
 {
-#line 1605 "insns.def"
+#line 1670 "insns.def"
     extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
-    vm_search_method(ci, cc, recv);
-
+    vm_search_method(ci, recv);
     val = Qundef;
 
-    if (check_cfunc(cc->me, rb_obj_not_equal)) {
-	val = opt_eq_func(recv, obj, ci_eq, cc_eq);
+    if (check_cfunc(ci->me, rb_obj_not_equal)) {
+	val = opt_eq_func(recv, obj, ci_eq);
 
 	if (val != Qundef) {
 	    val = RTEST(val) ? Qfalse : Qtrue;
@@ -2376,7 +2357,7 @@ INSN_ENTRY(opt_neq){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2380 "vm.inc"
+#line 2361 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_neq
@@ -2387,12 +2368,11 @@ INSN_ENTRY(opt_neq){
 INSN_ENTRY(opt_lt){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_lt");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_lt 1
@@ -2401,11 +2381,10 @@ INSN_ENTRY(opt_lt){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_lt));
   COLLECT_USAGE_OPERAND(BIN(opt_lt), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_lt), 1, cc);
 {
-#line 1637 "insns.def"
+#line 1701 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LT, INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_LT, FIXNUM_REDEFINED_OP_FLAG)) {
 	SIGNED_VALUE a = recv, b = obj;
 
 	if (a < b) {
@@ -2436,7 +2415,7 @@ INSN_ENTRY(opt_lt){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2440 "vm.inc"
+#line 2419 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_lt
@@ -2447,12 +2426,11 @@ INSN_ENTRY(opt_lt){
 INSN_ENTRY(opt_le){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_le");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_le 1
@@ -2461,11 +2439,10 @@ INSN_ENTRY(opt_le){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_le));
   COLLECT_USAGE_OPERAND(BIN(opt_le), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_le), 1, cc);
 {
-#line 1681 "insns.def"
+#line 1745 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LE, INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_LE, FIXNUM_REDEFINED_OP_FLAG)) {
 	SIGNED_VALUE a = recv, b = obj;
 
 	if (a <= b) {
@@ -2487,7 +2464,7 @@ INSN_ENTRY(opt_le){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2491 "vm.inc"
+#line 2468 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_le
@@ -2498,12 +2475,11 @@ INSN_ENTRY(opt_le){
 INSN_ENTRY(opt_gt){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_gt");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_gt 1
@@ -2512,11 +2488,10 @@ INSN_ENTRY(opt_gt){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_gt));
   COLLECT_USAGE_OPERAND(BIN(opt_gt), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_gt), 1, cc);
 {
-#line 1716 "insns.def"
+#line 1780 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GT, INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_GT, FIXNUM_REDEFINED_OP_FLAG)) {
 	SIGNED_VALUE a = recv, b = obj;
 
 	if (a > b) {
@@ -2547,7 +2522,7 @@ INSN_ENTRY(opt_gt){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2551 "vm.inc"
+#line 2526 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_gt
@@ -2558,12 +2533,11 @@ INSN_ENTRY(opt_gt){
 INSN_ENTRY(opt_ge){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_ge");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_ge 1
@@ -2572,11 +2546,10 @@ INSN_ENTRY(opt_ge){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_ge));
   COLLECT_USAGE_OPERAND(BIN(opt_ge), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_ge), 1, cc);
 {
-#line 1760 "insns.def"
+#line 1824 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GE, INTEGER_REDEFINED_OP_FLAG)) {
+	BASIC_OP_UNREDEFINED_P(BOP_GE, FIXNUM_REDEFINED_OP_FLAG)) {
 	SIGNED_VALUE a = recv, b = obj;
 
 	if (a >= b) {
@@ -2597,7 +2570,7 @@ INSN_ENTRY(opt_ge){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2601 "vm.inc"
+#line 2574 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_ge
@@ -2608,12 +2581,11 @@ INSN_ENTRY(opt_ge){
 INSN_ENTRY(opt_ltlt){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_ltlt");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_ltlt 1
@@ -2622,9 +2594,8 @@ INSN_ENTRY(opt_ltlt){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_ltlt));
   COLLECT_USAGE_OPERAND(BIN(opt_ltlt), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_ltlt), 1, cc);
 {
-#line 1794 "insns.def"
+#line 1858 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cString &&
 	    BASIC_OP_UNREDEFINED_P(BOP_LTLT, STRING_REDEFINED_OP_FLAG)) {
@@ -2645,7 +2616,7 @@ INSN_ENTRY(opt_ltlt){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2649 "vm.inc"
+#line 2620 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_ltlt
@@ -2656,12 +2627,11 @@ INSN_ENTRY(opt_ltlt){
 INSN_ENTRY(opt_aref){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_aref");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_aref 1
@@ -2670,9 +2640,8 @@ INSN_ENTRY(opt_aref){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_aref));
   COLLECT_USAGE_OPERAND(BIN(opt_aref), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_aref), 1, cc);
 {
-#line 1826 "insns.def"
+#line 1890 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_AREF, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
 	    val = rb_ary_entry(recv, FIX2LONG(obj));
@@ -2691,7 +2660,7 @@ INSN_ENTRY(opt_aref){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2695 "vm.inc"
+#line 2664 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aref
@@ -2702,13 +2671,12 @@ INSN_ENTRY(opt_aref){
 INSN_ENTRY(opt_aset){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(2);
   VALUE obj = TOPN(1);
   VALUE set = TOPN(0);
   DEBUG_ENTER_INSN("opt_aset");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(3);
   #define CURRENT_INSN_opt_aset 1
@@ -2717,9 +2685,8 @@ INSN_ENTRY(opt_aset){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_aset));
   COLLECT_USAGE_OPERAND(BIN(opt_aset), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_aset), 1, cc);
 {
-#line 1856 "insns.def"
+#line 1920 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_ASET, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
 	    rb_ary_store(recv, FIX2LONG(obj), set);
@@ -2741,7 +2708,7 @@ INSN_ENTRY(opt_aset){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2745 "vm.inc"
+#line 2712 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aset
@@ -2751,13 +2718,12 @@ INSN_ENTRY(opt_aset){
   END_INSN(opt_aset);}}}
 INSN_ENTRY(opt_aset_with){
 {
-  VALUE key = (VALUE)GET_OPERAND(3);
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
+  VALUE key = (VALUE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE val = TOPN(0);
   DEBUG_ENTER_INSN("opt_aset_with");
-  ADD_PC(1+3);
+  ADD_PC(1+2);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_aset_with 1
@@ -2766,11 +2732,12 @@ INSN_ENTRY(opt_aset_with){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_aset_with));
   COLLECT_USAGE_OPERAND(BIN(opt_aset_with), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_aset_with), 1, cc);
-  COLLECT_USAGE_OPERAND(BIN(opt_aset_with), 2, key);
+  COLLECT_USAGE_OPERAND(BIN(opt_aset_with), 1, key);
 {
-#line 1889 "insns.def"
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
+#line 1953 "insns.def"
+    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
+	BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG) &&
+	rb_hash_compare_by_id_p(recv) == Qfalse) {
 	rb_hash_aset(recv, key, val);
     }
     else {
@@ -2780,7 +2747,7 @@ INSN_ENTRY(opt_aset_with){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2784 "vm.inc"
+#line 2751 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aset_with
@@ -2791,12 +2758,11 @@ INSN_ENTRY(opt_aset_with){
 INSN_ENTRY(opt_aref_with){
 {
   VALUE val;
-  VALUE key = (VALUE)GET_OPERAND(3);
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
+  VALUE key = (VALUE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_aref_with");
-  ADD_PC(1+3);
+  ADD_PC(1+2);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_aref_with 1
@@ -2805,11 +2771,12 @@ INSN_ENTRY(opt_aref_with){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_aref_with));
   COLLECT_USAGE_OPERAND(BIN(opt_aref_with), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_aref_with), 1, cc);
-  COLLECT_USAGE_OPERAND(BIN(opt_aref_with), 2, key);
+  COLLECT_USAGE_OPERAND(BIN(opt_aref_with), 1, key);
 {
-#line 1911 "insns.def"
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
+#line 1977 "insns.def"
+    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
+	BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG) &&
+	rb_hash_compare_by_id_p(recv) == Qfalse) {
 	val = rb_hash_aref(recv, key);
     }
     else {
@@ -2818,7 +2785,7 @@ INSN_ENTRY(opt_aref_with){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2822 "vm.inc"
+#line 2789 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aref_with
@@ -2829,11 +2796,10 @@ INSN_ENTRY(opt_aref_with){
 INSN_ENTRY(opt_length){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_length");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_length 1
@@ -2842,9 +2808,8 @@ INSN_ENTRY(opt_length){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_length));
   COLLECT_USAGE_OPERAND(BIN(opt_length), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_length), 1, cc);
 {
-#line 1932 "insns.def"
+#line 2000 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cString &&
 	    BASIC_OP_UNREDEFINED_P(BOP_LENGTH, STRING_REDEFINED_OP_FLAG)) {
@@ -2868,7 +2833,7 @@ INSN_ENTRY(opt_length){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2872 "vm.inc"
+#line 2837 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_length
@@ -2879,11 +2844,10 @@ INSN_ENTRY(opt_length){
 INSN_ENTRY(opt_size){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_size");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_size 1
@@ -2892,9 +2856,8 @@ INSN_ENTRY(opt_size){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_size));
   COLLECT_USAGE_OPERAND(BIN(opt_size), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_size), 1, cc);
 {
-#line 1967 "insns.def"
+#line 2035 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cString &&
 	    BASIC_OP_UNREDEFINED_P(BOP_SIZE, STRING_REDEFINED_OP_FLAG)) {
@@ -2918,7 +2881,7 @@ INSN_ENTRY(opt_size){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2922 "vm.inc"
+#line 2885 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_size
@@ -2929,11 +2892,10 @@ INSN_ENTRY(opt_size){
 INSN_ENTRY(opt_empty_p){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_empty_p");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_empty_p 1
@@ -2942,9 +2904,8 @@ INSN_ENTRY(opt_empty_p){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_empty_p));
   COLLECT_USAGE_OPERAND(BIN(opt_empty_p), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_empty_p), 1, cc);
 {
-#line 2002 "insns.def"
+#line 2070 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (RBASIC_CLASS(recv) == rb_cString &&
 	    BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, STRING_REDEFINED_OP_FLAG)) {
@@ -2971,7 +2932,7 @@ INSN_ENTRY(opt_empty_p){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 2975 "vm.inc"
+#line 2936 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_empty_p
@@ -2982,11 +2943,10 @@ INSN_ENTRY(opt_empty_p){
 INSN_ENTRY(opt_succ){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_succ");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_succ 1
@@ -2995,18 +2955,17 @@ INSN_ENTRY(opt_succ){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_succ));
   COLLECT_USAGE_OPERAND(BIN(opt_succ), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_succ), 1, cc);
 {
-#line 2040 "insns.def"
+#line 2108 "insns.def"
     if (SPECIAL_CONST_P(recv)) {
 	if (FIXNUM_P(recv) &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, INTEGER_REDEFINED_OP_FLAG)) {
+	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, FIXNUM_REDEFINED_OP_FLAG)) {
+	    const VALUE obj = INT2FIX(1);
 	    /* fixnum + INT2FIX(1) */
-	    if (recv != LONG2FIX(FIXNUM_MAX)) {
-		val = recv - 1 + INT2FIX(1);
-	    }
-	    else {
-		val = LONG2NUM(FIXNUM_MAX + 1);
+	    val = (recv + (obj & (~1)));
+	    if ((~(recv ^ obj) & (recv ^ val)) & ((unsigned long)LONG_MAX + 1)) {
+		val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
+				  rb_int2big(FIX2LONG(obj)));
 	    }
 	}
 	else {
@@ -3018,8 +2977,7 @@ INSN_ENTRY(opt_succ){
 	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
 	    val = rb_str_succ(recv);
 	}
-	else
-	  {
+	else {
 	    goto INSN_LABEL(normal_dispatch);
 	}
     }
@@ -3029,7 +2987,7 @@ INSN_ENTRY(opt_succ){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 3033 "vm.inc"
+#line 2991 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_succ
@@ -3040,11 +2998,10 @@ INSN_ENTRY(opt_succ){
 INSN_ENTRY(opt_not){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_not");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_not 1
@@ -3053,12 +3010,12 @@ INSN_ENTRY(opt_not){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_not));
   COLLECT_USAGE_OPERAND(BIN(opt_not), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_not), 1, cc);
 {
-#line 2083 "insns.def"
-    vm_search_method(ci, cc, recv);
+#line 2150 "insns.def"
+    extern VALUE rb_obj_not(VALUE obj);
+    vm_search_method(ci, recv);
 
-    if (check_cfunc(cc->me, rb_obj_not)) {
+    if (check_cfunc(ci->me, rb_obj_not)) {
 	val = RTEST(recv) ? Qfalse : Qtrue;
     }
     else {
@@ -3066,7 +3023,7 @@ INSN_ENTRY(opt_not){
 	CALL_SIMPLE_METHOD(recv);
     }
 
-#line 3070 "vm.inc"
+#line 3027 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_not
@@ -3090,7 +3047,7 @@ INSN_ENTRY(opt_regexpmatch1){
   COLLECT_USAGE_INSN(BIN(opt_regexpmatch1));
   COLLECT_USAGE_OPERAND(BIN(opt_regexpmatch1), 0, r);
 {
-#line 2106 "insns.def"
+#line 2174 "insns.def"
     if (BASIC_OP_UNREDEFINED_P(BOP_MATCH, REGEXP_REDEFINED_OP_FLAG)) {
 	val = rb_reg_match(r, obj);
     }
@@ -3098,7 +3055,7 @@ INSN_ENTRY(opt_regexpmatch1){
 	val = rb_funcall(r, idEqTilde, 1, obj);
     }
 
-#line 3102 "vm.inc"
+#line 3059 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_regexpmatch1
@@ -3109,12 +3066,11 @@ INSN_ENTRY(opt_regexpmatch1){
 INSN_ENTRY(opt_regexpmatch2){
 {
   VALUE val;
-  CALL_CACHE cc = (CALL_CACHE)GET_OPERAND(2);
   CALL_INFO ci = (CALL_INFO)GET_OPERAND(1);
   VALUE obj2 = TOPN(1);
   VALUE obj1 = TOPN(0);
   DEBUG_ENTER_INSN("opt_regexpmatch2");
-  ADD_PC(1+2);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_regexpmatch2 1
@@ -3123,9 +3079,8 @@ INSN_ENTRY(opt_regexpmatch2){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(opt_regexpmatch2));
   COLLECT_USAGE_OPERAND(BIN(opt_regexpmatch2), 0, ci);
-  COLLECT_USAGE_OPERAND(BIN(opt_regexpmatch2), 1, cc);
 {
-#line 2125 "insns.def"
+#line 2193 "insns.def"
     if (CLASS_OF(obj2) == rb_cString &&
 	BASIC_OP_UNREDEFINED_P(BOP_MATCH, STRING_REDEFINED_OP_FLAG)) {
 	val = rb_reg_match(obj1, obj2);
@@ -3136,7 +3091,7 @@ INSN_ENTRY(opt_regexpmatch2){
 	CALL_SIMPLE_METHOD(obj2);
     }
 
-#line 3140 "vm.inc"
+#line 3095 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_regexpmatch2
@@ -3158,7 +3113,7 @@ INSN_ENTRY(opt_call_c_function){
   COLLECT_USAGE_INSN(BIN(opt_call_c_function));
   COLLECT_USAGE_OPERAND(BIN(opt_call_c_function), 0, funcptr);
 {
-#line 2147 "insns.def"
+#line 2215 "insns.def"
     reg_cfp = (funcptr)(th, reg_cfp);
 
     if (reg_cfp == 0) {
@@ -3170,7 +3125,7 @@ INSN_ENTRY(opt_call_c_function){
     RESTORE_REGS();
     NEXT_INSN();
 
-#line 3174 "vm.inc"
+#line 3129 "vm.inc"
 #undef CURRENT_INSN_opt_call_c_function
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -3190,10 +3145,10 @@ INSN_ENTRY(bitblt){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(bitblt));
 {
-#line 2170 "insns.def"
+#line 2238 "insns.def"
     ret = rb_str_new2("a bit of bacon, lettuce and tomato");
 
-#line 3197 "vm.inc"
+#line 3152 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_bitblt
@@ -3215,10 +3170,10 @@ INSN_ENTRY(answer){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   COLLECT_USAGE_INSN(BIN(answer));
 {
-#line 2184 "insns.def"
+#line 2252 "insns.def"
     ret = INT2FIX(42);
 
-#line 3222 "vm.inc"
+#line 3177 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_answer
@@ -3244,7 +3199,7 @@ INSN_ENTRY(getlocal_OP__WC__0){
 {
 #line 60 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
@@ -3252,7 +3207,7 @@ INSN_ENTRY(getlocal_OP__WC__0){
     }
     val = *(ep - idx);
 
-#line 3256 "vm.inc"
+#line 3211 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef level
@@ -3279,7 +3234,7 @@ INSN_ENTRY(getlocal_OP__WC__1){
 {
 #line 60 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
@@ -3287,7 +3242,7 @@ INSN_ENTRY(getlocal_OP__WC__1){
     }
     val = *(ep - idx);
 
-#line 3291 "vm.inc"
+#line 3246 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef level
@@ -3314,15 +3269,15 @@ INSN_ENTRY(setlocal_OP__WC__0){
 {
 #line 83 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
 	ep = GET_PREV_EP(ep);
     }
-    vm_env_write(ep, -(int)idx, val);
+    *(ep - idx) = val;
 
-#line 3326 "vm.inc"
+#line 3281 "vm.inc"
 #undef level
 #undef CURRENT_INSN_setlocal_OP__WC__0
 #undef INSN_IS_SC
@@ -3347,15 +3302,15 @@ INSN_ENTRY(setlocal_OP__WC__1){
 {
 #line 83 "insns.def"
     int i, lev = (int)level;
-    const VALUE *ep = GET_EP();
+    VALUE *ep = GET_EP();
 
     /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
     for (i = 0; i < lev; i++) {
 	ep = GET_PREV_EP(ep);
     }
-    vm_env_write(ep, -(int)idx, val);
+    *(ep - idx) = val;
 
-#line 3359 "vm.inc"
+#line 3314 "vm.inc"
 #undef level
 #undef CURRENT_INSN_setlocal_OP__WC__1
 #undef INSN_IS_SC
@@ -3379,7 +3334,7 @@ INSN_ENTRY(putobject_OP_INT2FIX_O_0_C_){
 #line 299 "insns.def"
     /* */
 
-#line 3383 "vm.inc"
+#line 3338 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef val
@@ -3405,7 +3360,7 @@ INSN_ENTRY(putobject_OP_INT2FIX_O_1_C_){
 #line 299 "insns.def"
     /* */
 
-#line 3409 "vm.inc"
+#line 3364 "vm.inc"
   CHECK_VM_STACK_OVERFLOW_FOR_INSN(REG_CFP, 1);
   PUSH(val);
 #undef val