Use a common function for normal and frameless implementations

Author: kylekatarnls

ext/standard/math.c

@@ -389,17 +389,7 @@ PHP_FUNCTION(round)
 }
 /* }}} */
 
-/* {{{ Return the given value if in range of min and max */
-PHP_FUNCTION(clamp)
-{
-	zval *zvalue, *zmin, *zmax;
-
-	ZEND_PARSE_PARAMETERS_START(3, 3)
-		Z_PARAM_ZVAL(zvalue)
-		Z_PARAM_ZVAL(zmin)
-		Z_PARAM_ZVAL(zmax)
-	ZEND_PARSE_PARAMETERS_END();
-
+static inline double php_clamp(const zval *zvalue, const zval *zmin, const zval *zmax) {
 	if (EXPECTED(Z_TYPE_P(zmin) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmin)))) {
 		zend_argument_value_error(2, "cannot be NAN");
 		RETURN_THROWS();
@@ -425,6 +415,20 @@ PHP_FUNCTION(clamp)
 
 	RETURN_COPY(zvalue);
 }
+
+/* {{{ Return the given value if in range of min and max */
+PHP_FUNCTION(clamp)
+{
+	zval *zvalue, *zmin, *zmax;
+
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+		Z_PARAM_ZVAL(zvalue)
+		Z_PARAM_ZVAL(zmin)
+		Z_PARAM_ZVAL(zmax)
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_clamp(zvalue, zmin, zmax);
+}
 /* }}} */
 
 /* {{{ Return the given value if in range of min and max */
@@ -435,30 +439,7 @@ ZEND_FRAMELESS_FUNCTION(clamp, 3)
 	Z_FLF_PARAM_ZVAL(2, zmin);
 	Z_FLF_PARAM_ZVAL(3, zmax);
 
-	if (EXPECTED(Z_TYPE_P(zmin) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmin)))) {
-		zend_argument_value_error(2, "cannot be NAN");
-		RETURN_THROWS();
-	}
-
-	if (EXPECTED(Z_TYPE_P(zmax) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmax)))) {
-		zend_argument_value_error(3, "cannot be NAN");
-		RETURN_THROWS();
-	}
-
-	if (zend_compare(zmax, zmin) == -1) {
-		zend_argument_value_error(2, "must be smaller than or equal to argument #3 ($max)");
-		RETURN_THROWS();
-	}
-
-	if (zend_compare(zmax, zvalue) == -1) {
-		RETURN_COPY(zmax);
-	}
-
-	if (zend_compare(zvalue, zmin) == -1) {
-		RETURN_COPY(zmin);
-	}
-
-	RETURN_COPY(zvalue);
+	php_clamp(zvalue, zmin, zmax);
 }
 /* }}} */