From: Peter Bergner <bergner@linux.ibm.com>
Date: Wed, 7 Jul 2021 16:39:34 +0000 (-0500)
Subject: rs6000: Harden mma_init_builtins
X-Git-Tag: releases/gcc-11.2.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90678482326ef1408748563f190dd7638e7724ee;p=thirdparty%2Fgcc.git

rs6000: Harden mma_init_builtins

The previous MMA patch added some fragile code to initialize its new
built-ins.  This patch hardens the initialization.

2021-07-07  Peter Bergner  <bergner@linux.ibm.com>

gcc/
	* config/rs6000/rs6000-call.c (mma_init_builtins): Use VSX_BUILTIN_LXVP
	and VSX_BUILTIN_STXVP.

(cherry picked from commit 6278065af07634278ba30029d92a82b089969baa)
---

diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c
index 273cf8927da0..7059f4fab1c7 100644
--- a/gcc/config/rs6000/rs6000-call.c
+++ b/gcc/config/rs6000/rs6000-call.c
@@ -14318,7 +14318,8 @@ mma_init_builtins (void)
 	  /* Some MMA built-ins that are expanded into gimple are converted
 	     into internal MMA built-ins that are expanded into rtl.
 	     The internal built-in follows immediately after this built-in.  */
-	  if (d[1].icode != CODE_FOR_nothing)
+	  if (d->code != VSX_BUILTIN_LXVP
+	      && d->code != VSX_BUILTIN_STXVP)
 	    {
 	      op[nopnds++] = void_type_node;
 	      icode = d[1].icode;