semantics.c (expand_or_defer_fn_1): Check for keep-inline-dllexport that we operate...

	* semantics.c (expand_or_defer_fn_1): Check for keep-inline-dllexport
	that we operate on a true inline.

From-SVN: r213751

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 23afac42f14af5e16dced3b4ba5a5b13c0c401fe..7125444f3313696c484027536fdd3e685dc3a235 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-08  Kai Tietz  <ktietz@redhat.com>
+
+       * semantics.c (expand_or_defer_fn_1): Check for keep-inline-dllexport
+       that we operate on a true inline.
+
 2014-08-07  Trevor Saunders  <tsaunders@mozilla.com>
 
        * class.c, cp-gimplify.c, decl.c, decl2.c, error.c, method.c,

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 14bf82d6f0a072413f332059df13b03d06839c23..63365c70e1abe2db2bbf993746255e5dc8f09a9e 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -4014,11 +4014,11 @@ expand_or_defer_fn_1 (tree fn)
         this function as needed so that finish_file will make sure to
         output it later.  Similarly, all dllexport'd functions must
         be emitted; there may be callers in other DLLs.  */
-      if ((flag_keep_inline_functions
-          && DECL_DECLARED_INLINE_P (fn)
-          && !DECL_REALLY_EXTERN (fn))
-         || (flag_keep_inline_dllexport
-             && lookup_attribute ("dllexport", DECL_ATTRIBUTES (fn))))
+      if (DECL_DECLARED_INLINE_P (fn)
+         && !DECL_REALLY_EXTERN (fn)
+         && (flag_keep_inline_functions
+             || (flag_keep_inline_dllexport
+                 && lookup_attribute ("dllexport", DECL_ATTRIBUTES (fn)))))
        {
          mark_needed (fn);
          DECL_EXTERNAL (fn) = 0;