re PR target/90867 (Multiplication or typecast of integer and double always zero...

	PR target/90867
	* config/i386/i386.c (ix86_valid_target_attribute_tree): Don't
	clear opts->x_ix86_isa_flags{,2} here...
	(ix86_valid_target_attribute_inner_p): ... but here when seeing
	arch=.  Also clear opts->x_ix86_isa_flags{,2}_explicit.

	* gcc.target/i386/pr90867.c: New test.

From-SVN: r278490

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83766ae2030368d85f6d77912ec6645e29b84318..8fff1141ee52159cb114e14323b17bdaf1911f5c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-11-20  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/90867
+       * config/i386/i386.c (ix86_valid_target_attribute_tree): Don't
+       clear opts->x_ix86_isa_flags{,2} here...
+       (ix86_valid_target_attribute_inner_p): ... but here when seeing
+       arch=.  Also clear opts->x_ix86_isa_flags{,2}_explicit.
+
        PR c/90898
        * tree-ssa-ccp.c (insert_clobber_before_stack_restore): Remove
        assertion.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 73a3ef364b34a6e3cbc442e959b89b1493ac1ce3..ce3fbd120ed73ff6edb3ac1ae3e81b9ccda6ac2e 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -5423,7 +5423,25 @@ ix86_valid_target_attribute_inner_p (tree args, char *p_strings[],
              ret = false;
            }
          else
-           p_strings[opt] = xstrdup (p + opt_len);
+           {
+             p_strings[opt] = xstrdup (p + opt_len);
+             if (opt == IX86_FUNCTION_SPECIFIC_ARCH)
+               {
+                 /* If arch= is set,  clear all bits in x_ix86_isa_flags,
+                    except for ISA_64BIT, ABI_64, ABI_X32, and CODE16
+                    and all bits in x_ix86_isa_flags2.  */
+                 opts->x_ix86_isa_flags &= (OPTION_MASK_ISA_64BIT
+                                            | OPTION_MASK_ABI_64
+                                            | OPTION_MASK_ABI_X32
+                                            | OPTION_MASK_CODE16);
+                 opts->x_ix86_isa_flags_explicit &= (OPTION_MASK_ISA_64BIT
+                                                     | OPTION_MASK_ABI_64
+                                                     | OPTION_MASK_ABI_X32
+                                                     | OPTION_MASK_CODE16);
+                 opts->x_ix86_isa_flags2 = 0;
+                 opts->x_ix86_isa_flags2_explicit = 0;
+               }
+           }
        }
 
       else if (type == ix86_opt_enum)
@@ -5498,18 +5516,8 @@ ix86_valid_target_attribute_tree (tree args,
       /* If we are using the default tune= or arch=, undo the string assigned,
         and use the default.  */
       if (option_strings[IX86_FUNCTION_SPECIFIC_ARCH])
-       {
-         opts->x_ix86_arch_string
-           = ggc_strdup (option_strings[IX86_FUNCTION_SPECIFIC_ARCH]);
-
-         /* If arch= is set,  clear all bits in x_ix86_isa_flags,
-            except for ISA_64BIT, ABI_64, ABI_X32, and CODE16.  */
-         opts->x_ix86_isa_flags &= (OPTION_MASK_ISA_64BIT
-                                    | OPTION_MASK_ABI_64
-                                    | OPTION_MASK_ABI_X32
-                                    | OPTION_MASK_CODE16);
-         opts->x_ix86_isa_flags2 = 0;
-       }
+       opts->x_ix86_arch_string
+         = ggc_strdup (option_strings[IX86_FUNCTION_SPECIFIC_ARCH]);
       else if (!orig_arch_specified)
        opts->x_ix86_arch_string = NULL;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0b764de8aa043ef370d6d0da5c6847a65b551c8..9f6b7c8aa9b402a161fa770829555b5ca95334a1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-11-20  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/90867
+       * gcc.target/i386/pr90867.c: New test.
+
        PR c/90898
        * gcc.dg/pr90898.c: New test.
 

diff --git a/gcc/testsuite/gcc.target/i386/pr90867.c b/gcc/testsuite/gcc.target/i386/pr90867.c
new file mode 100644 (file)
index 0000000..1ed96b5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr90867.c
@@ -0,0 +1,30 @@
+/* PR target/90867 */
+/* { dg-do run { target lp64 } } */
+/* { dg-options "-O2 -msse2" } */
+
+unsigned long long freq = 3600000000UL;   /* 3.6 GHz = 3600.0 MHz */
+
+__attribute__((noipa)) void
+bar (double x)
+{
+  static double d = 3600000000.0;
+  if (x != d)
+    __builtin_abort ();
+  d /= 1000.0;
+}
+
+__attribute__ ((target ("arch=x86-64"))) int
+foo ()
+{
+  bar ((double) freq);
+  bar (1e-3 * freq);
+  bar (1e-6 * freq);
+  bar (1e-9 * freq);
+  return 0;
+}
+
+int
+main ()
+{
+  return foo ();
+}