Patchwork [committed] Don't error on failure to inline redefined gnu extern inline always_inline function (PR tree-optimization/33763)

login
register
mail settings
Submitter Jakub Jelinek
Date Oct. 5, 2012, 11:51 a.m.
Message ID <20121005115106.GJ1787@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/189459/
State New
Headers show

Comments

Jakub Jelinek - Oct. 5, 2012, 11:51 a.m.
Hi!

This is something various Linux distributions have been carrying around for
5 years, and glibc headers rely on this.  The comment says what the intended
ideal state is, but during those 5 years that hasn't been implemented.

Pre-approved by Richard on IRC, committed to trunk.


	Jakub

Patch

--- gcc/ChangeLog	(revision 192118)
+++ gcc/ChangeLog	(revision 192119)
@@ -1,3 +1,10 @@ 
+2012-10-05  Jan Hubicka  <jh@suse.cz>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/33763
+	* tree-inline.c (expand_call_inline): Silently ignore always_inline
+	attribute for redefined extern inline functions.
+
 2012-10-04  Jan Hubicka  <jh@suse.cz>
 
 	* tree-vectorizer.h (vect_estimate_min_profitable_iters): Remove.
--- gcc/testsuite/ChangeLog	(revision 192118)
+++ gcc/testsuite/ChangeLog	(revision 192119)
@@ -1,5 +1,8 @@ 
 2012-10-05  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/33763
+	* c-c++-common/pr33763.c: New test.
+
 	PR tree-optimization/54810
 	* gcc.dg/tree-ssa/vrp85.c: New test.
 
--- gcc/tree-inline.c	(revision 192118)
+++ gcc/tree-inline.c	(revision 192119)
@@ -3814,6 +3814,12 @@  expand_call_inline (basic_block bb, gimp
 	goto egress;
 
       if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
+          /* For extern inline functions that get redefined we always
+	     silently ignored always_inline flag. Better behaviour would
+	     be to be able to keep both bodies and use extern inline body
+	     for inlining, but we can't do that because frontends overwrite
+	     the body.  */
+	  && !cg_edge->callee->local.redefined_extern_inline
 	  /* Avoid warnings during early inline pass. */
 	  && cgraph_global_info_ready
 	  /* PR 20090218-1_0.c. Body can be provided by another module. */
--- gcc/testsuite/c-c++-common/pr33763.c	(revision 0)
+++ gcc/testsuite/c-c++-common/pr33763.c	(revision 192119)
@@ -0,0 +1,60 @@ 
+/* PR tree-optimization/33763 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef struct
+{
+  void *a;
+  void *b;
+} T;
+extern void *foo (const char *, const char *);
+extern void *bar (void *, const char *, T);
+extern int baz (const char *, int);
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+baz (const char *x, int y)
+{
+  return 2;
+}
+
+int
+baz (const char *x, int y)
+{
+  return 1;
+}
+
+int xa, xb;
+
+static void *
+inl (const char *x, const char *y)
+{
+  T t = { &xa, &xb };
+  int *f = (int *) __builtin_malloc (sizeof (int));
+  const char *z;
+  int o = 0;
+  void *r = 0;
+
+  for (z = y; *z; z++)
+    {
+      if (*z == 'r')
+	o |= 1;
+      if (*z == 'w')
+	o |= 2;
+    }
+  if (o == 1)
+    *f = baz (x, 0);
+  if (o == 2)
+    *f = baz (x, 1);
+  if (o == 3)
+    *f = baz (x, 2);
+
+  if (o && *f > 0)
+    r = bar (f, "w", t);
+  return r;
+}
+
+void *
+foo (const char *x, const char *y)
+{
+  return inl (x, y);
+}