Remove unnecessary IS_UNUSED check

nikic · nikic · commit 34257e1cfccb · 2021-06-15T14:27:41.000+02:00
This operand cannot be UNUSED.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -6460,7 +6460,7 @@ ZEND_VM_C_LABEL(num_index_dim):
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (OP1_TYPE != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -24566,7 +24566,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDL
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
@@ -26741,7 +26741,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_TMPVAR_HAND
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
@@ -30741,7 +30741,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
@@ -41984,7 +41984,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLE
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
@@ -45452,7 +45452,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_TMPVAR_HANDL
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);
@@ -50557,7 +50557,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(Z
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
-		} else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
+		} else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 			zend_throw_error(NULL, "Cannot unset string offsets");
 		}
 	} while (0);

Original file line number	Diff line number	Diff line change
`@@ -6460,7 +6460,7 @@ ZEND_VM_C_LABEL(num_index_dim):`
`6460`	`6460`	`offset++;`
`6461`	`6461`	`}`
`6462`	`6462`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`6463`		`- } else if (OP1_TYPE != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`6463`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`6464`	`6464`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`6465`	`6465`	`}`
`6466`	`6466`	`} while (0);`
Original file line number	Diff line number	Diff line change
`@@ -24566,7 +24566,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDL`
`24566`	`24566`	`offset++;`
`24567`	`24567`	`}`
`24568`	`24568`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`24569`		`- } else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`24569`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`24570`	`24570`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`24571`	`24571`	`}`
`24572`	`24572`	`} while (0);`
`@@ -26741,7 +26741,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_TMPVAR_HAND`
`26741`	`26741`	`offset++;`
`26742`	`26742`	`}`
`26743`	`26743`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`26744`		`- } else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`26744`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`26745`	`26745`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`26746`	`26746`	`}`
`26747`	`26747`	`} while (0);`
`@@ -30741,7 +30741,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(`
`30741`	`30741`	`offset++;`
`30742`	`30742`	`}`
`30743`	`30743`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`30744`		`- } else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`30744`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`30745`	`30745`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`30746`	`30746`	`}`
`30747`	`30747`	`} while (0);`
`@@ -41984,7 +41984,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLE`
`41984`	`41984`	`offset++;`
`41985`	`41985`	`}`
`41986`	`41986`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`41987`		`- } else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`41987`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`41988`	`41988`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`41989`	`41989`	`}`
`41990`	`41990`	`} while (0);`
`@@ -45452,7 +45452,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_TMPVAR_HANDL`
`45452`	`45452`	`offset++;`
`45453`	`45453`	`}`
`45454`	`45454`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`45455`		`- } else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`45455`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`45456`	`45456`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`45457`	`45457`	`}`
`45458`	`45458`	`} while (0);`
`@@ -50557,7 +50557,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(Z`
`50557`	`50557`	`offset++;`
`50558`	`50558`	`}`
`50559`	`50559`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`50560`		`- } else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
	`50560`	`+ } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`50561`	`50561`	`zend_throw_error(NULL, "Cannot unset string offsets");`
`50562`	`50562`	`}`
`50563`	`50563`	`} while (0);`