i386.c (ix86_can_inline_p): Use || instead of & when checking if callee's isa flags...

	* config/i386/i386.c (ix86_can_inline_p): Use || instead of &
	when checking if callee's isa flags are subset of caller's isa flags.
	Fix comment wording.

From-SVN: r242628

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3c5c16c4814d82daf65b2cc504a57db5f5e6548..23de483cc35aa79f9c214ba1b21258e704b5d41a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-19  Jakub Jelinek  <jakub@redhat.com>
 
+       * config/i386/i386.c (ix86_can_inline_p): Use || instead of &
+       when checking if callee's isa flags are subset of caller's isa flags.
+       Fix comment wording.
+
        * config/i386/i386.c (ix86_valid_target_attribute_tree): Don't
        clear opts->x_ix86_isa_flags, clear opts->x_ix86_isa_flags2
        instead and using = 0 instead of &= 0.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 959653757fe42528eaf34d0454a824e6adf4d9e5..2db1e897c1811ed515ae4afafa2a7637850f4a22 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6981,13 +6981,13 @@ ix86_can_inline_p (tree caller, tree callee)
       struct cl_target_option *caller_opts = TREE_TARGET_OPTION (caller_tree);
       struct cl_target_option *callee_opts = TREE_TARGET_OPTION (callee_tree);
 
-      /* Callee's isa options should a subset of the caller's, i.e. a SSE4 function
-        can inline a SSE2 function but a SSE2 function can't inline a SSE4
-        function.  */
+      /* Callee's isa options should be a subset of the caller's, i.e. a SSE4
+        function can inline a SSE2 function but a SSE2 function can't inline
+        a SSE4 function.  */
       if (((caller_opts->x_ix86_isa_flags & callee_opts->x_ix86_isa_flags)
-         != callee_opts->x_ix86_isa_flags) &
-         ((caller_opts->x_ix86_isa_flags2 & callee_opts->x_ix86_isa_flags2)
-         != callee_opts->x_ix86_isa_flags2))
+          != callee_opts->x_ix86_isa_flags)
+         || ((caller_opts->x_ix86_isa_flags2 & callee_opts->x_ix86_isa_flags2)
+             != callee_opts->x_ix86_isa_flags2))
        ret = false;
 
       /* See if we have the same non-isa options.  */