[gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Use built-in fntype, not instance fntype, for type conversion

[gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Use built-in fntype, not instance fntype, for type conversion

[William Schmidt]

https://gcc.gnu.org/g:a3dba458c201f27201b0e4e2c446c2320b33e0c6

commit a3dba458c201f27201b0e4e2c446c2320b33e0c6
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date:   Fri Dec 18 16:31:59 2020 -0600

    rs6000: Use built-in fntype, not instance fntype, for type conversion
    
    2020-12-18  Bill Schmidt  <wschmidt@linux.ibm.com>
    
            * config/rs6000/rs6000-c.c
            (altivec_resolve_new_overloaded_builtin): Use built-in fntype.

Diff:
---
 gcc/config/rs6000/rs6000-c.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index cf70d438c86..d05da4fceaa 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -2827,7 +2827,7 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 	  instance = instance->next;
 
 	gcc_assert (instance != NULL);
-	tree fntype = instance->fntype;
+	tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
 	tree parmtype0 = TREE_VALUE (TYPE_ARG_TYPES (fntype));
 	tree parmtype1 = TREE_VALUE (TREE_CHAIN (parmtype0));
 
@@ -2881,7 +2881,7 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 	  instance = instance->next;
 
 	gcc_assert (instance != NULL);
-	tree fntype = instance->fntype;
+	tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
 	tree parmtype0 = TREE_VALUE (TYPE_ARG_TYPES (fntype));
 	tree parmtype1 = TREE_VALUE (TREE_CHAIN (parmtype0));
 
@@ -2923,10 +2923,12 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 
 	    if (rs6000_builtin_decl (instance->bifid, false) != error_mark_node
 		&& rs6000_new_builtin_is_supported_p (instance->bifid))
-	      return altivec_build_new_resolved_builtin (args, n,
-							 instance->fntype,
-							 instance->bifid,
-							 fcode);
+	      {
+		tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
+		return altivec_build_new_resolved_builtin (args, n, fntype,
+							   instance->bifid,
+							   fcode);
+	      }
 	    else
 	      {
 		unsupported_builtin = true;

[gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Use built-in fntype, not instance fntype, for type conversion

[William Schmidt]

https://gcc.gnu.org/g:f75fdcac97f9cad57deb4b2330b3b0200aae497a

commit f75fdcac97f9cad57deb4b2330b3b0200aae497a
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date:   Fri Dec 18 16:31:59 2020 -0600

    rs6000: Use built-in fntype, not instance fntype, for type conversion
    
    2020-12-18  Bill Schmidt  <wschmidt@linux.ibm.com>
    
            * config/rs6000/rs6000-c.c
            (altivec_resolve_new_overloaded_builtin): Use built-in fntype.

Diff:
---
 gcc/config/rs6000/rs6000-c.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index d7f0a87a95a..edab5a05a8f 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -2845,7 +2845,7 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 	  instance = instance->next;
 
 	gcc_assert (instance != NULL);
-	tree fntype = instance->fntype;
+	tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
 	tree parmtype0 = TREE_VALUE (TYPE_ARG_TYPES (fntype));
 	tree parmtype1 = TREE_VALUE (TREE_CHAIN (parmtype0));
 
@@ -2899,7 +2899,7 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 	  instance = instance->next;
 
 	gcc_assert (instance != NULL);
-	tree fntype = instance->fntype;
+	tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
 	tree parmtype0 = TREE_VALUE (TYPE_ARG_TYPES (fntype));
 	tree parmtype1 = TREE_VALUE (TREE_CHAIN (parmtype0));
 
@@ -2941,10 +2941,12 @@ altivec_resolve_new_overloaded_builtin (location_t loc, tree fndecl,
 
 	    if (rs6000_builtin_decl (instance->bifid, false) != error_mark_node
 		&& rs6000_new_builtin_is_supported_p (instance->bifid))
-	      return altivec_build_new_resolved_builtin (args, n,
-							 instance->fntype,
-							 instance->bifid,
-							 fcode);
+	      {
+		tree fntype = rs6000_builtin_info_x[instance->bifid].fntype;
+		return altivec_build_new_resolved_builtin (args, n, fntype,
+							   instance->bifid,
+							   fcode);
+	      }
 	    else
 	      {
 		unsupported_builtin = true;