API tools faq
paste
laruence

Untitled

laruence
Jul 10th, 2015
271
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 38.37 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
  2. index b4eeeb4..5b18869 100644
  3. --- a/Zend/zend_vm_def.h
  4. +++ b/Zend/zend_vm_def.h
  5. @@ -33,22 +33,22 @@ ZEND_VM_HANDLER(1, ZEND_ADD, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
  6.  
  7.     op1 = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
  8.     op2 = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);
  9. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  10. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  11. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  12. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  13.             result = EX_VAR(opline->result.var);
  14.             fast_long_add_function(result, op1, op2);
  15.             ZEND_VM_NEXT_OPCODE();
  16. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  17. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  18.             result = EX_VAR(opline->result.var);
  19.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  20.             ZEND_VM_NEXT_OPCODE();
  21.         }
  22. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  23. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  24. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  25. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  26.             result = EX_VAR(opline->result.var);
  27.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  28.             ZEND_VM_NEXT_OPCODE();
  29. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  30. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  31.             result = EX_VAR(opline->result.var);
  32.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  33.             ZEND_VM_NEXT_OPCODE();
  34. @@ -56,10 +56,10 @@ ZEND_VM_HANDLER(1, ZEND_ADD, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
  35.     }
  36.  
  37.     SAVE_OPLINE();
  38. -   if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  39. +   if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  40.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  41.     }
  42. -   if (OP2_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  43. +   if (OP2_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  44.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  45.     }
  46.     add_function(EX_VAR(opline->result.var), op1, op2);
  47. @@ -76,22 +76,22 @@ ZEND_VM_HANDLER(2, ZEND_SUB, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
  48.  
  49.     op1 = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
  50.     op2 = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);
  51. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  52. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  53. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  54. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  55.             result = EX_VAR(opline->result.var);
  56.             fast_long_sub_function(result, op1, op2);
  57.             ZEND_VM_NEXT_OPCODE();
  58. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  59. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  60.             result = EX_VAR(opline->result.var);
  61.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  62.             ZEND_VM_NEXT_OPCODE();
  63.         }
  64. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  65. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  66. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  67. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  68.             result = EX_VAR(opline->result.var);
  69.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  70.             ZEND_VM_NEXT_OPCODE();
  71. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  72. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  73.             result = EX_VAR(opline->result.var);
  74.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  75.             ZEND_VM_NEXT_OPCODE();
  76. @@ -99,10 +99,10 @@ ZEND_VM_HANDLER(2, ZEND_SUB, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
  77.     }
  78.  
  79.     SAVE_OPLINE();
  80. -   if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  81. +   if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  82.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  83.     }
  84. -   if (OP2_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  85. +   if (OP2_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  86.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  87.     }
  88.     sub_function(EX_VAR(opline->result.var), op1, op2);
  89. diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
  90. index a84fcda..8c8b389 100644
  91. --- a/Zend/zend_vm_execute.h
  92. +++ b/Zend/zend_vm_execute.h
  93. @@ -4277,22 +4277,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_CONST_HANDLER(Z
  94.  
  95.     op1 = EX_CONSTANT(opline->op1);
  96.     op2 = EX_CONSTANT(opline->op2);
  97. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  98. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  99. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  100. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  101.             result = EX_VAR(opline->result.var);
  102.             fast_long_add_function(result, op1, op2);
  103.             ZEND_VM_NEXT_OPCODE();
  104. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  105. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  106.             result = EX_VAR(opline->result.var);
  107.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  108.             ZEND_VM_NEXT_OPCODE();
  109.         }
  110. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  111. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  112. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  113. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  114.             result = EX_VAR(opline->result.var);
  115.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  116.             ZEND_VM_NEXT_OPCODE();
  117. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  118. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  119.             result = EX_VAR(opline->result.var);
  120.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  121.             ZEND_VM_NEXT_OPCODE();
  122. @@ -4300,10 +4300,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_CONST_HANDLER(Z
  123.     }
  124.  
  125.     SAVE_OPLINE();
  126. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  127. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  128.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  129.     }
  130. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  131. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  132.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  133.     }
  134.     add_function(EX_VAR(opline->result.var), op1, op2);
  135. @@ -4320,22 +4320,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_CONST_HANDLER(Z
  136.  
  137.     op1 = EX_CONSTANT(opline->op1);
  138.     op2 = EX_CONSTANT(opline->op2);
  139. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  140. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  141. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  142. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  143.             result = EX_VAR(opline->result.var);
  144.             fast_long_sub_function(result, op1, op2);
  145.             ZEND_VM_NEXT_OPCODE();
  146. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  147. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  148.             result = EX_VAR(opline->result.var);
  149.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  150.             ZEND_VM_NEXT_OPCODE();
  151.         }
  152. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  153. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  154. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  155. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  156.             result = EX_VAR(opline->result.var);
  157.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  158.             ZEND_VM_NEXT_OPCODE();
  159. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  160. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  161.             result = EX_VAR(opline->result.var);
  162.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  163.             ZEND_VM_NEXT_OPCODE();
  164. @@ -4343,10 +4343,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_CONST_HANDLER(Z
  165.     }
  166.  
  167.     SAVE_OPLINE();
  168. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  169. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  170.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  171.     }
  172. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  173. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  174.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  175.     }
  176.     sub_function(EX_VAR(opline->result.var), op1, op2);
  177. @@ -8242,22 +8242,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND
  178.  
  179.     op1 = EX_CONSTANT(opline->op1);
  180.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  181. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  182. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  183. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  184. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  185.             result = EX_VAR(opline->result.var);
  186.             fast_long_add_function(result, op1, op2);
  187.             ZEND_VM_NEXT_OPCODE();
  188. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  189. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  190.             result = EX_VAR(opline->result.var);
  191.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  192.             ZEND_VM_NEXT_OPCODE();
  193.         }
  194. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  195. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  196. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  197. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  198.             result = EX_VAR(opline->result.var);
  199.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  200.             ZEND_VM_NEXT_OPCODE();
  201. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  202. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  203.             result = EX_VAR(opline->result.var);
  204.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  205.             ZEND_VM_NEXT_OPCODE();
  206. @@ -8265,10 +8265,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND
  207.     }
  208.  
  209.     SAVE_OPLINE();
  210. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  211. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  212.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  213.     }
  214. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  215. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  216.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  217.     }
  218.     add_function(EX_VAR(opline->result.var), op1, op2);
  219. @@ -8285,22 +8285,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND
  220.  
  221.     op1 = EX_CONSTANT(opline->op1);
  222.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  223. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  224. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  225. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  226. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  227.             result = EX_VAR(opline->result.var);
  228.             fast_long_sub_function(result, op1, op2);
  229.             ZEND_VM_NEXT_OPCODE();
  230. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  231. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  232.             result = EX_VAR(opline->result.var);
  233.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  234.             ZEND_VM_NEXT_OPCODE();
  235.         }
  236. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  237. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  238. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  239. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  240.             result = EX_VAR(opline->result.var);
  241.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  242.             ZEND_VM_NEXT_OPCODE();
  243. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  244. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  245.             result = EX_VAR(opline->result.var);
  246.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  247.             ZEND_VM_NEXT_OPCODE();
  248. @@ -8308,10 +8308,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND
  249.     }
  250.  
  251.     SAVE_OPLINE();
  252. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  253. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  254.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  255.     }
  256. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  257. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  258.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  259.     }
  260.     sub_function(EX_VAR(opline->result.var), op1, op2);
  261. @@ -10085,22 +10085,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_TMPVAR_HANDLER(
  262.  
  263.     op1 = EX_CONSTANT(opline->op1);
  264.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  265. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  266. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  267. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  268. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  269.             result = EX_VAR(opline->result.var);
  270.             fast_long_add_function(result, op1, op2);
  271.             ZEND_VM_NEXT_OPCODE();
  272. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  273. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  274.             result = EX_VAR(opline->result.var);
  275.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  276.             ZEND_VM_NEXT_OPCODE();
  277.         }
  278. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  279. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  280. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  281. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  282.             result = EX_VAR(opline->result.var);
  283.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  284.             ZEND_VM_NEXT_OPCODE();
  285. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  286. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  287.             result = EX_VAR(opline->result.var);
  288.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  289.             ZEND_VM_NEXT_OPCODE();
  290. @@ -10108,10 +10108,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CONST_TMPVAR_HANDLER(
  291.     }
  292.  
  293.     SAVE_OPLINE();
  294. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  295. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  296.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  297.     }
  298. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  299. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  300.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  301.     }
  302.     add_function(EX_VAR(opline->result.var), op1, op2);
  303. @@ -10128,22 +10128,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_TMPVAR_HANDLER(
  304.  
  305.     op1 = EX_CONSTANT(opline->op1);
  306.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  307. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  308. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  309. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  310. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  311.             result = EX_VAR(opline->result.var);
  312.             fast_long_sub_function(result, op1, op2);
  313.             ZEND_VM_NEXT_OPCODE();
  314. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  315. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  316.             result = EX_VAR(opline->result.var);
  317.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  318.             ZEND_VM_NEXT_OPCODE();
  319.         }
  320. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  321. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  322. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  323. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  324.             result = EX_VAR(opline->result.var);
  325.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  326.             ZEND_VM_NEXT_OPCODE();
  327. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  328. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  329.             result = EX_VAR(opline->result.var);
  330.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  331.             ZEND_VM_NEXT_OPCODE();
  332. @@ -10151,10 +10151,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CONST_TMPVAR_HANDLER(
  333.     }
  334.  
  335.     SAVE_OPLINE();
  336. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  337. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  338.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  339.     }
  340. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  341. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  342.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  343.     }
  344.     sub_function(EX_VAR(opline->result.var), op1, op2);
  345. @@ -29603,22 +29603,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND
  346.  
  347.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  348.     op2 = EX_CONSTANT(opline->op2);
  349. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  350. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  351. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  352. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  353.             result = EX_VAR(opline->result.var);
  354.             fast_long_add_function(result, op1, op2);
  355.             ZEND_VM_NEXT_OPCODE();
  356. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  357. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  358.             result = EX_VAR(opline->result.var);
  359.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  360.             ZEND_VM_NEXT_OPCODE();
  361.         }
  362. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  363. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  364. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  365. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  366.             result = EX_VAR(opline->result.var);
  367.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  368.             ZEND_VM_NEXT_OPCODE();
  369. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  370. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  371.             result = EX_VAR(opline->result.var);
  372.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  373.             ZEND_VM_NEXT_OPCODE();
  374. @@ -29626,10 +29626,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND
  375.     }
  376.  
  377.     SAVE_OPLINE();
  378. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  379. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  380.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  381.     }
  382. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  383. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  384.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  385.     }
  386.     add_function(EX_VAR(opline->result.var), op1, op2);
  387. @@ -29646,22 +29646,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND
  388.  
  389.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  390.     op2 = EX_CONSTANT(opline->op2);
  391. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  392. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  393. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  394. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  395.             result = EX_VAR(opline->result.var);
  396.             fast_long_sub_function(result, op1, op2);
  397.             ZEND_VM_NEXT_OPCODE();
  398. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  399. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  400.             result = EX_VAR(opline->result.var);
  401.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  402.             ZEND_VM_NEXT_OPCODE();
  403.         }
  404. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  405. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  406. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  407. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  408.             result = EX_VAR(opline->result.var);
  409.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  410.             ZEND_VM_NEXT_OPCODE();
  411. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  412. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  413.             result = EX_VAR(opline->result.var);
  414.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  415.             ZEND_VM_NEXT_OPCODE();
  416. @@ -29669,10 +29669,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND
  417.     }
  418.  
  419.     SAVE_OPLINE();
  420. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  421. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  422.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  423.     }
  424. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  425. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  426.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  427.     }
  428.     sub_function(EX_VAR(opline->result.var), op1, op2);
  429. @@ -34826,22 +34826,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OP
  430.  
  431.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  432.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  433. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  434. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  435. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  436. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  437.             result = EX_VAR(opline->result.var);
  438.             fast_long_add_function(result, op1, op2);
  439.             ZEND_VM_NEXT_OPCODE();
  440. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  441. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  442.             result = EX_VAR(opline->result.var);
  443.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  444.             ZEND_VM_NEXT_OPCODE();
  445.         }
  446. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  447. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  448. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  449. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  450.             result = EX_VAR(opline->result.var);
  451.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  452.             ZEND_VM_NEXT_OPCODE();
  453. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  454. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  455.             result = EX_VAR(opline->result.var);
  456.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  457.             ZEND_VM_NEXT_OPCODE();
  458. @@ -34849,10 +34849,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OP
  459.     }
  460.  
  461.     SAVE_OPLINE();
  462. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  463. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  464.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  465.     }
  466. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  467. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  468.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  469.     }
  470.     add_function(EX_VAR(opline->result.var), op1, op2);
  471. @@ -34869,22 +34869,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OP
  472.  
  473.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  474.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  475. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  476. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  477. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  478. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  479.             result = EX_VAR(opline->result.var);
  480.             fast_long_sub_function(result, op1, op2);
  481.             ZEND_VM_NEXT_OPCODE();
  482. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  483. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  484.             result = EX_VAR(opline->result.var);
  485.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  486.             ZEND_VM_NEXT_OPCODE();
  487.         }
  488. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  489. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  490. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  491. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  492.             result = EX_VAR(opline->result.var);
  493.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  494.             ZEND_VM_NEXT_OPCODE();
  495. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  496. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  497.             result = EX_VAR(opline->result.var);
  498.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  499.             ZEND_VM_NEXT_OPCODE();
  500. @@ -34892,10 +34892,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OP
  501.     }
  502.  
  503.     SAVE_OPLINE();
  504. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  505. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  506.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  507.     }
  508. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  509. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  510.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  511.     }
  512.     sub_function(EX_VAR(opline->result.var), op1, op2);
  513. @@ -37506,22 +37506,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_TMPVAR_HANDLER(ZEN
  514.  
  515.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  516.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  517. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  518. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  519. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  520. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  521.             result = EX_VAR(opline->result.var);
  522.             fast_long_add_function(result, op1, op2);
  523.             ZEND_VM_NEXT_OPCODE();
  524. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  525. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  526.             result = EX_VAR(opline->result.var);
  527.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  528.             ZEND_VM_NEXT_OPCODE();
  529.         }
  530. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  531. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  532. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  533. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  534.             result = EX_VAR(opline->result.var);
  535.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  536.             ZEND_VM_NEXT_OPCODE();
  537. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  538. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  539.             result = EX_VAR(opline->result.var);
  540.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  541.             ZEND_VM_NEXT_OPCODE();
  542. @@ -37529,10 +37529,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_CV_TMPVAR_HANDLER(ZEN
  543.     }
  544.  
  545.     SAVE_OPLINE();
  546. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  547. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  548.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  549.     }
  550. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  551. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  552.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  553.     }
  554.     add_function(EX_VAR(opline->result.var), op1, op2);
  555. @@ -37549,22 +37549,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_TMPVAR_HANDLER(ZEN
  556.  
  557.     op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  558.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  559. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  560. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  561. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  562. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  563.             result = EX_VAR(opline->result.var);
  564.             fast_long_sub_function(result, op1, op2);
  565.             ZEND_VM_NEXT_OPCODE();
  566. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  567. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  568.             result = EX_VAR(opline->result.var);
  569.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  570.             ZEND_VM_NEXT_OPCODE();
  571.         }
  572. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  573. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  574. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  575. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  576.             result = EX_VAR(opline->result.var);
  577.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  578.             ZEND_VM_NEXT_OPCODE();
  579. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  580. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  581.             result = EX_VAR(opline->result.var);
  582.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  583.             ZEND_VM_NEXT_OPCODE();
  584. @@ -37572,10 +37572,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_TMPVAR_HANDLER(ZEN
  585.     }
  586.  
  587.     SAVE_OPLINE();
  588. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  589. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  590.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  591.     }
  592. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  593. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  594.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  595.     }
  596.     sub_function(EX_VAR(opline->result.var), op1, op2);
  597. @@ -40517,22 +40517,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_CONST_HANDLER(
  598.  
  599.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  600.     op2 = EX_CONSTANT(opline->op2);
  601. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  602. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  603. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  604. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  605.             result = EX_VAR(opline->result.var);
  606.             fast_long_add_function(result, op1, op2);
  607.             ZEND_VM_NEXT_OPCODE();
  608. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  609. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  610.             result = EX_VAR(opline->result.var);
  611.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  612.             ZEND_VM_NEXT_OPCODE();
  613.         }
  614. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  615. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  616. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  617. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  618.             result = EX_VAR(opline->result.var);
  619.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  620.             ZEND_VM_NEXT_OPCODE();
  621. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  622. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  623.             result = EX_VAR(opline->result.var);
  624.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  625.             ZEND_VM_NEXT_OPCODE();
  626. @@ -40540,10 +40540,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_CONST_HANDLER(
  627.     }
  628.  
  629.     SAVE_OPLINE();
  630. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  631. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  632.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  633.     }
  634. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  635. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  636.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  637.     }
  638.     add_function(EX_VAR(opline->result.var), op1, op2);
  639. @@ -40560,22 +40560,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_CONST_HANDLER(
  640.  
  641.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  642.     op2 = EX_CONSTANT(opline->op2);
  643. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  644. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  645. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  646. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  647.             result = EX_VAR(opline->result.var);
  648.             fast_long_sub_function(result, op1, op2);
  649.             ZEND_VM_NEXT_OPCODE();
  650. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  651. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  652.             result = EX_VAR(opline->result.var);
  653.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  654.             ZEND_VM_NEXT_OPCODE();
  655.         }
  656. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  657. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  658. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  659. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  660.             result = EX_VAR(opline->result.var);
  661.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  662.             ZEND_VM_NEXT_OPCODE();
  663. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  664. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  665.             result = EX_VAR(opline->result.var);
  666.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  667.             ZEND_VM_NEXT_OPCODE();
  668. @@ -40583,10 +40583,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_CONST_HANDLER(
  669.     }
  670.  
  671.     SAVE_OPLINE();
  672. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  673. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  674.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  675.     }
  676. -   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  677. +   if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  678.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  679.     }
  680.     sub_function(EX_VAR(opline->result.var), op1, op2);
  681. @@ -42898,22 +42898,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_CV_HANDLER(ZEN
  682.  
  683.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  684.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  685. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  686. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  687. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  688. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  689.             result = EX_VAR(opline->result.var);
  690.             fast_long_add_function(result, op1, op2);
  691.             ZEND_VM_NEXT_OPCODE();
  692. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  693. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  694.             result = EX_VAR(opline->result.var);
  695.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  696.             ZEND_VM_NEXT_OPCODE();
  697.         }
  698. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  699. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  700. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  701. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  702.             result = EX_VAR(opline->result.var);
  703.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  704.             ZEND_VM_NEXT_OPCODE();
  705. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  706. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  707.             result = EX_VAR(opline->result.var);
  708.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  709.             ZEND_VM_NEXT_OPCODE();
  710. @@ -42921,10 +42921,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_CV_HANDLER(ZEN
  711.     }
  712.  
  713.     SAVE_OPLINE();
  714. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  715. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  716.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  717.     }
  718. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  719. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  720.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  721.     }
  722.     add_function(EX_VAR(opline->result.var), op1, op2);
  723. @@ -42941,22 +42941,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_CV_HANDLER(ZEN
  724.  
  725.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  726.     op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  727. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  728. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  729. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  730. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  731.             result = EX_VAR(opline->result.var);
  732.             fast_long_sub_function(result, op1, op2);
  733.             ZEND_VM_NEXT_OPCODE();
  734. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  735. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  736.             result = EX_VAR(opline->result.var);
  737.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  738.             ZEND_VM_NEXT_OPCODE();
  739.         }
  740. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  741. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  742. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  743. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  744.             result = EX_VAR(opline->result.var);
  745.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  746.             ZEND_VM_NEXT_OPCODE();
  747. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  748. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  749.             result = EX_VAR(opline->result.var);
  750.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  751.             ZEND_VM_NEXT_OPCODE();
  752. @@ -42964,10 +42964,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_CV_HANDLER(ZEN
  753.     }
  754.  
  755.     SAVE_OPLINE();
  756. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  757. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  758.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  759.     }
  760. -   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  761. +   if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  762.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  763.     }
  764.     sub_function(EX_VAR(opline->result.var), op1, op2);
  765. @@ -44035,22 +44035,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_TMPVAR_HANDLER
  766.  
  767.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  768.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  769. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  770. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  771. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  772. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  773.             result = EX_VAR(opline->result.var);
  774.             fast_long_add_function(result, op1, op2);
  775.             ZEND_VM_NEXT_OPCODE();
  776. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  777. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  778.             result = EX_VAR(opline->result.var);
  779.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2));
  780.             ZEND_VM_NEXT_OPCODE();
  781.         }
  782. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  783. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  784. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  785. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  786.             result = EX_VAR(opline->result.var);
  787.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2));
  788.             ZEND_VM_NEXT_OPCODE();
  789. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  790. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  791.             result = EX_VAR(opline->result.var);
  792.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2)));
  793.             ZEND_VM_NEXT_OPCODE();
  794. @@ -44058,10 +44058,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_SPEC_TMPVAR_TMPVAR_HANDLER
  795.     }
  796.  
  797.     SAVE_OPLINE();
  798. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  799. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  800.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  801.     }
  802. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  803. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  804.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  805.     }
  806.     add_function(EX_VAR(opline->result.var), op1, op2);
  807. @@ -44078,22 +44078,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_TMPVAR_HANDLER
  808.  
  809.     op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  810.     op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  811. -   if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
  812. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  813. +   if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
  814. +       if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  815.             result = EX_VAR(opline->result.var);
  816.             fast_long_sub_function(result, op1, op2);
  817.             ZEND_VM_NEXT_OPCODE();
  818. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  819. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  820.             result = EX_VAR(opline->result.var);
  821.             ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
  822.             ZEND_VM_NEXT_OPCODE();
  823.         }
  824. -   } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
  825. -       if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
  826. +   } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
  827. +       if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
  828.             result = EX_VAR(opline->result.var);
  829.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
  830.             ZEND_VM_NEXT_OPCODE();
  831. -       } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
  832. +       } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
  833.             result = EX_VAR(opline->result.var);
  834.             ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
  835.             ZEND_VM_NEXT_OPCODE();
  836. @@ -44101,10 +44101,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_TMPVAR_TMPVAR_HANDLER
  837.     }
  838.  
  839.     SAVE_OPLINE();
  840. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
  841. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
  842.         op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
  843.     }
  844. -   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
  845. +   if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
  846.         op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
  847.     }
  848.     sub_function(EX_VAR(opline->result.var), op1, op2);
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!