diff mbox

Extend fold_const_call to combined_fn

Message ID 87twoyq92a.fsf@e105548-lin.cambridge.arm.com
State New
Headers show

Commit Message

Richard Sandiford Nov. 7, 2015, 12:37 p.m. UTC
This patch extends fold_const_call so that it can handle internal
as well as built-in functions.

Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.
OK to install?

Thanks,
Richard


gcc/
	* fold-const-call.h (fold_const_call): Replace built_in_function
	arguments with combined_fn arguments.
	* fold-const-call.c: Include case-cfn-macros.h.
	(fold_const_call_ss, fold_const_call_cs, fold_const_call_sc)
	(fold_const_call_cc, fold_const_call_sss, fold_const_call_ccc)
	(fold_const_call_ssss, fold_const_call_1, fold_const_call): Replace
	built_in_function arguments with combined_fn arguments.
	* builtins.c (fold_builtin_sincos, fold_builtin_1, fold_builtin_2)
	(fold_builtin_3): Update calls to fold_const_call.

Comments

Jeff Law Nov. 9, 2015, 10:33 p.m. UTC | #1
On 11/07/2015 05:37 AM, Richard Sandiford wrote:
> This patch extends fold_const_call so that it can handle internal
> as well as built-in functions.
>
> Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.
> OK to install?
>
> Thanks,
> Richard
>
>
> gcc/
> 	* fold-const-call.h (fold_const_call): Replace built_in_function
> 	arguments with combined_fn arguments.
> 	* fold-const-call.c: Include case-cfn-macros.h.
> 	(fold_const_call_ss, fold_const_call_cs, fold_const_call_sc)
> 	(fold_const_call_cc, fold_const_call_sss, fold_const_call_ccc)
> 	(fold_const_call_ssss, fold_const_call_1, fold_const_call): Replace
> 	built_in_function arguments with combined_fn arguments.
> 	* builtins.c (fold_builtin_sincos, fold_builtin_1, fold_builtin_2)
> 	(fold_builtin_3): Update calls to fold_const_call.
OK.
jeff
diff mbox

Patch

diff --git a/gcc/builtins.c b/gcc/builtins.c
index edf0086..c393f7c 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -7348,7 +7348,7 @@  fold_builtin_sincos (location_t loc,
   if (TREE_CODE (arg0) == REAL_CST)
     {
       tree complex_type = build_complex_type (type);
-      call = fold_const_call (fn, complex_type, arg0);
+      call = fold_const_call (as_combined_fn (fn), complex_type, arg0);
     }
   if (!call)
     {
@@ -8193,7 +8193,7 @@  fold_builtin_1 (location_t loc, tree fndecl, tree arg0)
   if (TREE_CODE (arg0) == ERROR_MARK)
     return NULL_TREE;
 
-  if (tree ret = fold_const_call (fcode, type, arg0))
+  if (tree ret = fold_const_call (as_combined_fn (fcode), type, arg0))
     return ret;
 
   switch (fcode)
@@ -8320,7 +8320,7 @@  fold_builtin_2 (location_t loc, tree fndecl, tree arg0, tree arg1)
       || TREE_CODE (arg1) == ERROR_MARK)
     return NULL_TREE;
 
-  if (tree ret = fold_const_call (fcode, type, arg0, arg1))
+  if (tree ret = fold_const_call (as_combined_fn (fcode), type, arg0, arg1))
     return ret;
 
   switch (fcode)
@@ -8419,7 +8419,8 @@  fold_builtin_3 (location_t loc, tree fndecl,
       || TREE_CODE (arg2) == ERROR_MARK)
     return NULL_TREE;
 
-  if (tree ret = fold_const_call (fcode, type, arg0, arg1, arg2))
+  if (tree ret = fold_const_call (as_combined_fn (fcode), type,
+				  arg0, arg1, arg2))
     return ret;
 
   switch (fcode)
diff --git a/gcc/fold-const-call.c b/gcc/fold-const-call.c
index 49793a5..94801d2 100644
--- a/gcc/fold-const-call.c
+++ b/gcc/fold-const-call.c
@@ -26,6 +26,7 @@  along with GCC; see the file COPYING3.  If not see
 #include "options.h"
 #include "fold-const.h"
 #include "fold-const-call.h"
+#include "case-cfn-macros.h"
 #include "tm.h" /* For C[LT]Z_DEFINED_AT_ZERO.  */
 
 /* Functions that test for certain constant types, abstracting away the
@@ -574,114 +575,114 @@  fold_const_builtin_nan (tree type, tree arg, bool quiet)
    in format FORMAT.  Return true on success.  */
 
 static bool
-fold_const_call_ss (real_value *result, built_in_function fn,
+fold_const_call_ss (real_value *result, combined_fn fn,
 		    const real_value *arg, const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_SQRT):
+    CASE_CFN_SQRT:
       return (real_compare (GE_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_sqrt, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_CBRT):
+    CASE_CFN_CBRT:
       return do_mpfr_arg1 (result, mpfr_cbrt, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_ASIN):
+    CASE_CFN_ASIN:
       return (real_compare (GE_EXPR, arg, &dconstm1)
 	      && real_compare (LE_EXPR, arg, &dconst1)
 	      && do_mpfr_arg1 (result, mpfr_asin, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_ACOS):
+    CASE_CFN_ACOS:
       return (real_compare (GE_EXPR, arg, &dconstm1)
 	      && real_compare (LE_EXPR, arg, &dconst1)
 	      && do_mpfr_arg1 (result, mpfr_acos, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_ATAN):
+    CASE_CFN_ATAN:
       return do_mpfr_arg1 (result, mpfr_atan, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_ASINH):
+    CASE_CFN_ASINH:
       return do_mpfr_arg1 (result, mpfr_asinh, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_ACOSH):
+    CASE_CFN_ACOSH:
       return (real_compare (GE_EXPR, arg, &dconst1)
 	      && do_mpfr_arg1 (result, mpfr_acosh, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_ATANH):
+    CASE_CFN_ATANH:
       return (real_compare (GE_EXPR, arg, &dconstm1)
 	      && real_compare (LE_EXPR, arg, &dconst1)
 	      && do_mpfr_arg1 (result, mpfr_atanh, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_SIN):
+    CASE_CFN_SIN:
       return do_mpfr_arg1 (result, mpfr_sin, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_COS):
+    CASE_CFN_COS:
       return do_mpfr_arg1 (result, mpfr_cos, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_TAN):
+    CASE_CFN_TAN:
       return do_mpfr_arg1 (result, mpfr_tan, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_SINH):
+    CASE_CFN_SINH:
       return do_mpfr_arg1 (result, mpfr_sinh, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_COSH):
+    CASE_CFN_COSH:
       return do_mpfr_arg1 (result, mpfr_cosh, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_TANH):
+    CASE_CFN_TANH:
       return do_mpfr_arg1 (result, mpfr_tanh, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_ERF):
+    CASE_CFN_ERF:
       return do_mpfr_arg1 (result, mpfr_erf, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_ERFC):
+    CASE_CFN_ERFC:
       return do_mpfr_arg1 (result, mpfr_erfc, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_TGAMMA):
+    CASE_CFN_TGAMMA:
       return do_mpfr_arg1 (result, mpfr_gamma, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_EXP):
+    CASE_CFN_EXP:
       return do_mpfr_arg1 (result, mpfr_exp, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_EXP2):
+    CASE_CFN_EXP2:
       return do_mpfr_arg1 (result, mpfr_exp2, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_EXP10):
-    CASE_FLT_FN (BUILT_IN_POW10):
+    CASE_CFN_EXP10:
+    CASE_CFN_POW10:
       return do_mpfr_arg1 (result, mpfr_exp10, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_EXPM1):
+    CASE_CFN_EXPM1:
       return do_mpfr_arg1 (result, mpfr_expm1, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_LOG):
+    CASE_CFN_LOG:
       return (real_compare (GT_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_log, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_LOG2):
+    CASE_CFN_LOG2:
       return (real_compare (GT_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_log2, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_LOG10):
+    CASE_CFN_LOG10:
       return (real_compare (GT_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_log10, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_LOG1P):
+    CASE_CFN_LOG1P:
       return (real_compare (GT_EXPR, arg, &dconstm1)
 	      && do_mpfr_arg1 (result, mpfr_log1p, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_J0):
+    CASE_CFN_J0:
       return do_mpfr_arg1 (result, mpfr_j0, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_J1):
+    CASE_CFN_J1:
       return do_mpfr_arg1 (result, mpfr_j1, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_Y0):
+    CASE_CFN_Y0:
       return (real_compare (GT_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_y0, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_Y1):
+    CASE_CFN_Y1:
       return (real_compare (GT_EXPR, arg, &dconst0)
 	      && do_mpfr_arg1 (result, mpfr_y1, arg, format));
 
-    CASE_FLT_FN (BUILT_IN_FLOOR):
+    CASE_CFN_FLOOR:
       if (!REAL_VALUE_ISNAN (*arg) || !flag_errno_math)
 	{
 	  real_floor (result, format, arg);
@@ -689,7 +690,7 @@  fold_const_call_ss (real_value *result, built_in_function fn,
 	}
       return false;
 
-    CASE_FLT_FN (BUILT_IN_CEIL):
+    CASE_CFN_CEIL:
       if (!REAL_VALUE_ISNAN (*arg) || !flag_errno_math)
 	{
 	  real_ceil (result, format, arg);
@@ -697,11 +698,11 @@  fold_const_call_ss (real_value *result, built_in_function fn,
 	}
       return false;
 
-    CASE_FLT_FN (BUILT_IN_TRUNC):
+    CASE_CFN_TRUNC:
       real_trunc (result, format, arg);
       return true;
 
-    CASE_FLT_FN (BUILT_IN_ROUND):
+    CASE_CFN_ROUND:
       if (!REAL_VALUE_ISNAN (*arg) || !flag_errno_math)
 	{
 	  real_round (result, format, arg);
@@ -709,10 +710,10 @@  fold_const_call_ss (real_value *result, built_in_function fn,
 	}
       return false;
 
-    CASE_FLT_FN (BUILT_IN_LOGB):
+    CASE_CFN_LOGB:
       return fold_const_logb (result, arg, format);
 
-    CASE_FLT_FN (BUILT_IN_SIGNIFICAND):
+    CASE_CFN_SIGNIFICAND:
       return fold_const_significand (result, arg, format);
 
     default:
@@ -728,20 +729,20 @@  fold_const_call_ss (real_value *result, built_in_function fn,
    significant bits in the result.  Return true on success.  */
 
 static bool
-fold_const_call_ss (wide_int *result, built_in_function fn,
+fold_const_call_ss (wide_int *result, combined_fn fn,
 		    const real_value *arg, unsigned int precision,
 		    const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_SIGNBIT):
+    CASE_CFN_SIGNBIT:
       if (real_isneg (arg))
 	*result = wi::one (precision);
       else
 	*result = wi::zero (precision);
       return true;
 
-    CASE_FLT_FN (BUILT_IN_ILOGB):
+    CASE_CFN_ILOGB:
       /* For ilogb we don't know FP_ILOGB0, so only handle normal values.
 	 Proceed iff radix == 2.  In GCC, normalized significands are in
 	 the range [0.5, 1.0).  We want the exponent as if they were
@@ -753,52 +754,52 @@  fold_const_call_ss (wide_int *result, built_in_function fn,
 	}
       return false;
 
-    CASE_FLT_FN (BUILT_IN_ICEIL):
-    CASE_FLT_FN (BUILT_IN_LCEIL):
-    CASE_FLT_FN (BUILT_IN_LLCEIL):
+    CASE_CFN_ICEIL:
+    CASE_CFN_LCEIL:
+    CASE_CFN_LLCEIL:
       return fold_const_conversion (result, real_ceil, arg,
 				    precision, format);
 
-    CASE_FLT_FN (BUILT_IN_LFLOOR):
-    CASE_FLT_FN (BUILT_IN_IFLOOR):
-    CASE_FLT_FN (BUILT_IN_LLFLOOR):
+    CASE_CFN_LFLOOR:
+    CASE_CFN_IFLOOR:
+    CASE_CFN_LLFLOOR:
       return fold_const_conversion (result, real_floor, arg,
 				    precision, format);
 
-    CASE_FLT_FN (BUILT_IN_IROUND):
-    CASE_FLT_FN (BUILT_IN_LROUND):
-    CASE_FLT_FN (BUILT_IN_LLROUND):
+    CASE_CFN_IROUND:
+    CASE_CFN_LROUND:
+    CASE_CFN_LLROUND:
       return fold_const_conversion (result, real_round, arg,
 				    precision, format);
 
-    CASE_FLT_FN (BUILT_IN_IRINT):
-    CASE_FLT_FN (BUILT_IN_LRINT):
-    CASE_FLT_FN (BUILT_IN_LLRINT):
+    CASE_CFN_IRINT:
+    CASE_CFN_LRINT:
+    CASE_CFN_LLRINT:
       /* Not yet folded to a constant.  */
       return false;
 
-    CASE_FLT_FN (BUILT_IN_FINITE):
-    case BUILT_IN_FINITED32:
-    case BUILT_IN_FINITED64:
-    case BUILT_IN_FINITED128:
-    case BUILT_IN_ISFINITE:
+    CASE_CFN_FINITE:
+    case CFN_BUILT_IN_FINITED32:
+    case CFN_BUILT_IN_FINITED64:
+    case CFN_BUILT_IN_FINITED128:
+    case CFN_BUILT_IN_ISFINITE:
       *result = wi::shwi (real_isfinite (arg) ? 1 : 0, precision);
       return true;
 
-    CASE_FLT_FN (BUILT_IN_ISINF):
-    case BUILT_IN_ISINFD32:
-    case BUILT_IN_ISINFD64:
-    case BUILT_IN_ISINFD128:
+    CASE_CFN_ISINF:
+    case CFN_BUILT_IN_ISINFD32:
+    case CFN_BUILT_IN_ISINFD64:
+    case CFN_BUILT_IN_ISINFD128:
       if (real_isinf (arg))
 	*result = wi::shwi (arg->sign ? -1 : 1, precision);
       else
 	*result = wi::shwi (0, precision);
       return true;
 
-    CASE_FLT_FN (BUILT_IN_ISNAN):
-    case BUILT_IN_ISNAND32:
-    case BUILT_IN_ISNAND64:
-    case BUILT_IN_ISNAND128:
+    CASE_CFN_ISNAN:
+    case CFN_BUILT_IN_ISNAND32:
+    case CFN_BUILT_IN_ISNAND64:
+    case CFN_BUILT_IN_ISNAND128:
       *result = wi::shwi (real_isnan (arg) ? 1 : 0, precision);
       return true;
 
@@ -815,17 +816,16 @@  fold_const_call_ss (wide_int *result, built_in_function fn,
    in the result.  Return true on success.  */
 
 static bool
-fold_const_call_ss (wide_int *result, built_in_function fn,
-		    const wide_int_ref &arg, unsigned int precision,
-		    tree arg_type)
+fold_const_call_ss (wide_int *result, combined_fn fn, const wide_int_ref &arg,
+		    unsigned int precision, tree arg_type)
 {
   switch (fn)
     {
-    CASE_INT_FN (BUILT_IN_FFS):
+    CASE_CFN_FFS:
       *result = wi::shwi (wi::ffs (arg), precision);
       return true;
 
-    CASE_INT_FN (BUILT_IN_CLZ):
+    CASE_CFN_CLZ:
       {
 	int tmp;
 	if (wi::ne_p (arg, 0))
@@ -836,7 +836,7 @@  fold_const_call_ss (wide_int *result, built_in_function fn,
 	return true;
       }
 
-    CASE_INT_FN (BUILT_IN_CTZ):
+    CASE_CFN_CTZ:
       {
 	int tmp;
 	if (wi::ne_p (arg, 0))
@@ -847,21 +847,21 @@  fold_const_call_ss (wide_int *result, built_in_function fn,
 	return true;
       }
 
-    CASE_INT_FN (BUILT_IN_CLRSB):
+    CASE_CFN_CLRSB:
       *result = wi::shwi (wi::clrsb (arg), precision);
       return true;
 
-    CASE_INT_FN (BUILT_IN_POPCOUNT):
+    CASE_CFN_POPCOUNT:
       *result = wi::shwi (wi::popcount (arg), precision);
       return true;
 
-    CASE_INT_FN (BUILT_IN_PARITY):
+    CASE_CFN_PARITY:
       *result = wi::shwi (wi::parity (arg), precision);
       return true;
 
-    case BUILT_IN_BSWAP16:
-    case BUILT_IN_BSWAP32:
-    case BUILT_IN_BSWAP64:
+    case CFN_BUILT_IN_BSWAP16:
+    case CFN_BUILT_IN_BSWAP32:
+    case CFN_BUILT_IN_BSWAP64:
       *result = wide_int::from (arg, precision, TYPE_SIGN (arg_type)).bswap ();
       return true;
 
@@ -880,12 +880,12 @@  fold_const_call_ss (wide_int *result, built_in_function fn,
 
 static bool
 fold_const_call_cs (real_value *result_real, real_value *result_imag,
-		    built_in_function fn, const real_value *arg,
+		    combined_fn fn, const real_value *arg,
 		    const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_CEXPI):
+    CASE_CFN_CEXPI:
       /* cexpi(x+yi) = cos(x)+sin(y)*i.  */
       return do_mpfr_sincos (result_imag, result_real, arg, format);
 
@@ -903,13 +903,13 @@  fold_const_call_cs (real_value *result_real, real_value *result_imag,
    success.  */
 
 static bool
-fold_const_call_sc (real_value *result, built_in_function fn,
+fold_const_call_sc (real_value *result, combined_fn fn,
 		    const real_value *arg_real, const real_value *arg_imag,
 		    const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_CABS):
+    CASE_CFN_CABS:
       return do_mpfr_arg2 (result, mpfr_hypot, arg_real, arg_imag, format);
 
     default:
@@ -927,20 +927,20 @@  fold_const_call_sc (real_value *result, built_in_function fn,
 
 static bool
 fold_const_call_cc (real_value *result_real, real_value *result_imag,
-		    built_in_function fn, const real_value *arg_real,
+		    combined_fn fn, const real_value *arg_real,
 		    const real_value *arg_imag, const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_CCOS):
+    CASE_CFN_CCOS:
       return do_mpc_arg1 (result_real, result_imag, mpc_cos,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CCOSH):
+    CASE_CFN_CCOSH:
       return do_mpc_arg1 (result_real, result_imag, mpc_cosh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CPROJ):
+    CASE_CFN_CPROJ:
       if (real_isinf (arg_real) || real_isinf (arg_imag))
 	{
 	  real_inf (result_real);
@@ -954,55 +954,55 @@  fold_const_call_cc (real_value *result_real, real_value *result_imag,
 	}
       return true;
 
-    CASE_FLT_FN (BUILT_IN_CSIN):
+    CASE_CFN_CSIN:
       return do_mpc_arg1 (result_real, result_imag, mpc_sin,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CSINH):
+    CASE_CFN_CSINH:
       return do_mpc_arg1 (result_real, result_imag, mpc_sinh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CTAN):
+    CASE_CFN_CTAN:
       return do_mpc_arg1 (result_real, result_imag, mpc_tan,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CTANH):
+    CASE_CFN_CTANH:
       return do_mpc_arg1 (result_real, result_imag, mpc_tanh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CLOG):
+    CASE_CFN_CLOG:
       return do_mpc_arg1 (result_real, result_imag, mpc_log,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CSQRT):
+    CASE_CFN_CSQRT:
       return do_mpc_arg1 (result_real, result_imag, mpc_sqrt,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CASIN):
+    CASE_CFN_CASIN:
       return do_mpc_arg1 (result_real, result_imag, mpc_asin,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CACOS):
+    CASE_CFN_CACOS:
       return do_mpc_arg1 (result_real, result_imag, mpc_acos,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CATAN):
+    CASE_CFN_CATAN:
       return do_mpc_arg1 (result_real, result_imag, mpc_atan,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CASINH):
+    CASE_CFN_CASINH:
       return do_mpc_arg1 (result_real, result_imag, mpc_asinh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CACOSH):
+    CASE_CFN_CACOSH:
       return do_mpc_arg1 (result_real, result_imag, mpc_acosh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CATANH):
+    CASE_CFN_CATANH:
       return do_mpc_arg1 (result_real, result_imag, mpc_atanh,
 			  arg_real, arg_imag, format);
 
-    CASE_FLT_FN (BUILT_IN_CEXP):
+    CASE_CFN_CEXP:
       return do_mpc_arg1 (result_real, result_imag, mpc_exp,
 			  arg_real, arg_imag, format);
 
@@ -1015,7 +1015,7 @@  fold_const_call_cc (real_value *result_real, real_value *result_imag,
    where the arguments and result are numerical.  */
 
 static tree
-fold_const_call_1 (built_in_function fn, tree type, tree arg)
+fold_const_call_1 (combined_fn fn, tree type, tree arg)
 {
   machine_mode mode = TYPE_MODE (type);
   machine_mode arg_mode = TYPE_MODE (TREE_TYPE (arg));
@@ -1110,22 +1110,22 @@  fold_const_call_1 (built_in_function fn, tree type, tree arg)
    otherwise return null.  TYPE is the type of the return value.  */
 
 tree
-fold_const_call (built_in_function fn, tree type, tree arg)
+fold_const_call (combined_fn fn, tree type, tree arg)
 {
   switch (fn)
     {
-    case BUILT_IN_STRLEN:
+    case CFN_BUILT_IN_STRLEN:
       if (const char *str = c_getstr (arg))
 	return build_int_cst (type, strlen (str));
       return NULL_TREE;
 
-    CASE_FLT_FN (BUILT_IN_NAN):
-    case BUILT_IN_NAND32:
-    case BUILT_IN_NAND64:
-    case BUILT_IN_NAND128:
+    CASE_CFN_NAN:
+    case CFN_BUILT_IN_NAND32:
+    case CFN_BUILT_IN_NAND64:
+    case CFN_BUILT_IN_NAND128:
       return fold_const_builtin_nan (type, arg, true);
 
-    CASE_FLT_FN (BUILT_IN_NANS):
+    CASE_CFN_NANS:
       return fold_const_builtin_nan (type, arg, false);
 
     default:
@@ -1140,37 +1140,37 @@  fold_const_call (built_in_function fn, tree type, tree arg)
    in format FORMAT.  Return true on success.  */
 
 static bool
-fold_const_call_sss (real_value *result, built_in_function fn,
+fold_const_call_sss (real_value *result, combined_fn fn,
 		     const real_value *arg0, const real_value *arg1,
 		     const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_DREM):
-    CASE_FLT_FN (BUILT_IN_REMAINDER):
+    CASE_CFN_DREM:
+    CASE_CFN_REMAINDER:
       return do_mpfr_arg2 (result, mpfr_remainder, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_ATAN2):
+    CASE_CFN_ATAN2:
       return do_mpfr_arg2 (result, mpfr_atan2, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_FDIM):
+    CASE_CFN_FDIM:
       return do_mpfr_arg2 (result, mpfr_dim, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_HYPOT):
+    CASE_CFN_HYPOT:
       return do_mpfr_arg2 (result, mpfr_hypot, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_COPYSIGN):
+    CASE_CFN_COPYSIGN:
       *result = *arg0;
       real_copysign (result, arg1);
       return true;
 
-    CASE_FLT_FN (BUILT_IN_FMIN):
+    CASE_CFN_FMIN:
       return do_mpfr_arg2 (result, mpfr_min, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_FMAX):
+    CASE_CFN_FMAX:
       return do_mpfr_arg2 (result, mpfr_max, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_POW):
+    CASE_CFN_POW:
       return fold_const_pow (result, arg0, arg1, format);
 
     default:
@@ -1186,22 +1186,22 @@  fold_const_call_sss (real_value *result, built_in_function fn,
    success.  */
 
 static bool
-fold_const_call_sss (real_value *result, built_in_function fn,
+fold_const_call_sss (real_value *result, combined_fn fn,
 		     const real_value *arg0, const wide_int_ref &arg1,
 		     const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_LDEXP):
+    CASE_CFN_LDEXP:
       return fold_const_builtin_load_exponent (result, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_SCALBN):
-    CASE_FLT_FN (BUILT_IN_SCALBLN):
+    CASE_CFN_SCALBN:
+    CASE_CFN_SCALBLN:
       return (format->b == 2
 	      && fold_const_builtin_load_exponent (result, arg0, arg1,
 						   format));
 
-    CASE_FLT_FN (BUILT_IN_POWI):
+    CASE_CFN_POWI:
       real_powi (result, format, arg0, arg1.to_shwi ());
       return true;
 
@@ -1218,16 +1218,16 @@  fold_const_call_sss (real_value *result, built_in_function fn,
    success.  */
 
 static bool
-fold_const_call_sss (real_value *result, built_in_function fn,
+fold_const_call_sss (real_value *result, combined_fn fn,
 		     const wide_int_ref &arg0, const real_value *arg1,
 		     const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_JN):
+    CASE_CFN_JN:
       return do_mpfr_arg2 (result, mpfr_jn, arg0, arg1, format);
 
-    CASE_FLT_FN (BUILT_IN_YN):
+    CASE_CFN_YN:
       return (real_compare (GT_EXPR, arg1, &dconst0)
 	      && do_mpfr_arg2 (result, mpfr_yn, arg0, arg1, format));
 
@@ -1246,13 +1246,13 @@  fold_const_call_sss (real_value *result, built_in_function fn,
 
 static bool
 fold_const_call_ccc (real_value *result_real, real_value *result_imag,
-		     built_in_function fn, const real_value *arg0_real,
+		     combined_fn fn, const real_value *arg0_real,
 		     const real_value *arg0_imag, const real_value *arg1_real,
 		     const real_value *arg1_imag, const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_CPOW):
+    CASE_CFN_CPOW:
       return do_mpc_arg2 (result_real, result_imag, mpc_pow,
 			  arg0_real, arg0_imag, arg1_real, arg1_imag, format);
 
@@ -1265,7 +1265,7 @@  fold_const_call_ccc (real_value *result_real, real_value *result_imag,
    where the arguments and result are numerical.  */
 
 static tree
-fold_const_call_1 (built_in_function fn, tree type, tree arg0, tree arg1)
+fold_const_call_1 (combined_fn fn, tree type, tree arg0, tree arg1)
 {
   machine_mode mode = TYPE_MODE (type);
   machine_mode arg0_mode = TYPE_MODE (TREE_TYPE (arg0));
@@ -1357,22 +1357,22 @@  fold_const_call_1 (built_in_function fn, tree type, tree arg0, tree arg1)
    otherwise return null.  TYPE is the type of the return value.  */
 
 tree
-fold_const_call (built_in_function fn, tree type, tree arg0, tree arg1)
+fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1)
 {
   const char *p0, *p1;
   switch (fn)
     {
-    case BUILT_IN_STRSPN:
+    case CFN_BUILT_IN_STRSPN:
       if ((p0 = c_getstr (arg0)) && (p1 = c_getstr (arg1)))
 	return build_int_cst (type, strspn (p0, p1));
       return NULL_TREE;
 
-    case BUILT_IN_STRCSPN:
+    case CFN_BUILT_IN_STRCSPN:
       if ((p0 = c_getstr (arg0)) && (p1 = c_getstr (arg1)))
 	return build_int_cst (type, strcspn (p0, p1));
       return NULL_TREE;
 
-    case BUILT_IN_STRCMP:
+    case CFN_BUILT_IN_STRCMP:
       if ((p0 = c_getstr (arg0)) && (p1 = c_getstr (arg1)))
 	return build_cmp_result (type, strcmp (p0, p1));
       return NULL_TREE;
@@ -1389,13 +1389,13 @@  fold_const_call (built_in_function fn, tree type, tree arg0, tree arg1)
    in format FORMAT.  Return true on success.  */
 
 static bool
-fold_const_call_ssss (real_value *result, built_in_function fn,
+fold_const_call_ssss (real_value *result, combined_fn fn,
 		      const real_value *arg0, const real_value *arg1,
 		      const real_value *arg2, const real_format *format)
 {
   switch (fn)
     {
-    CASE_FLT_FN (BUILT_IN_FMA):
+    CASE_CFN_FMA:
       return do_mpfr_arg3 (result, mpfr_fma, arg0, arg1, arg2, format);
 
     default:
@@ -1407,8 +1407,7 @@  fold_const_call_ssss (real_value *result, built_in_function fn,
    where the arguments and result are numerical.  */
 
 static tree
-fold_const_call_1 (built_in_function fn, tree type, tree arg0, tree arg1,
-		   tree arg2)
+fold_const_call_1 (combined_fn fn, tree type, tree arg0, tree arg1, tree arg2)
 {
   machine_mode mode = TYPE_MODE (type);
   machine_mode arg0_mode = TYPE_MODE (TREE_TYPE (arg0));
@@ -1442,22 +1441,21 @@  fold_const_call_1 (built_in_function fn, tree type, tree arg0, tree arg1,
    success, otherwise return null.  TYPE is the type of the return value.  */
 
 tree
-fold_const_call (built_in_function fn, tree type, tree arg0, tree arg1,
-		 tree arg2)
+fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1, tree arg2)
 {
   const char *p0, *p1;
   size_t s2;
   switch (fn)
     {
-    case BUILT_IN_STRNCMP:
+    case CFN_BUILT_IN_STRNCMP:
       if ((p0 = c_getstr (arg0))
 	  && (p1 = c_getstr (arg1))
 	  && host_size_t_cst_p (arg2, &s2))
 	return build_int_cst (type, strncmp (p0, p1, s2));
       return NULL_TREE;
 
-    case BUILT_IN_BCMP:
-    case BUILT_IN_MEMCMP:
+    case CFN_BUILT_IN_BCMP:
+    case CFN_BUILT_IN_MEMCMP:
       if ((p0 = c_getstr (arg0))
 	  && (p1 = c_getstr (arg1))
 	  && host_size_t_cst_p (arg2, &s2)
diff --git a/gcc/fold-const-call.h b/gcc/fold-const-call.h
index 6befc9b..2cb2c5b 100644
--- a/gcc/fold-const-call.h
+++ b/gcc/fold-const-call.h
@@ -20,9 +20,9 @@  along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_FOLD_CONST_CALL_H
 #define GCC_FOLD_CONST_CALL_H
 
-tree fold_const_call (built_in_function, tree, tree);
-tree fold_const_call (built_in_function, tree, tree, tree);
-tree fold_const_call (built_in_function, tree, tree, tree, tree);
+tree fold_const_call (combined_fn, tree, tree);
+tree fold_const_call (combined_fn, tree, tree, tree);
+tree fold_const_call (combined_fn, tree, tree, tree, tree);
 tree fold_fma (location_t, tree, tree, tree, tree);
 
 #endif