diff mbox series

[committed,GCC-10,backport] d: Explicitly determine which built-in copysign function to call.

Message ID 20201118103318.4098083-1-ibuclaw@gdcproject.org
State New
Headers show
Series [committed,GCC-10,backport] d: Explicitly determine which built-in copysign function to call. | expand

Commit Message

Iain Buclaw Nov. 18, 2020, 10:33 a.m. UTC 
Hi,

This patch backports r11-4980 to GCC-10, as it fixes an ICE that could
occur on some targets.

Regression tested on x86_64-linux-gnu and committed to branch.

Regards
Iain

---
gcc/d/ChangeLog:

	* intrinsics.cc (expand_intrinsic_copysign): Explicitly determine
	which built-in copysign function to call.

(cherry picked from commit d975d6dce98a3e26ddd304d50dad2786b3acecc4)
---
 gcc/d/intrinsics.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc
index c32819885bb..51cbd7b92fd 100644
--- a/gcc/d/intrinsics.cc
+++ b/gcc/d/intrinsics.cc
@@ -430,11 +430,14 @@  expand_intrinsic_copysign (tree callexp)
     from = fold_convert (type, from);
 
   /* Which variant of __builtin_copysign* should we call?  */
-  tree builtin = mathfn_built_in (type, BUILT_IN_COPYSIGN);
-  gcc_assert (builtin != NULL_TREE);
+  built_in_function code = (type == float_type_node) ? BUILT_IN_COPYSIGNF
+    : (type == double_type_node) ? BUILT_IN_COPYSIGN
+    : (type == long_double_type_node) ? BUILT_IN_COPYSIGNL
+    : END_BUILTINS;
 
-  return call_builtin_fn (callexp, DECL_FUNCTION_CODE (builtin), 2,
-			  to, from);
+  gcc_assert (code != END_BUILTINS);
+
+  return call_builtin_fn (callexp, code, 2, to, from);
 }
 
 /* Expand a front-end intrinsic call to pow().  This takes two arguments, the