2008-02-22 Andrew Pinski <andrew_pinski@playstation.sony.com>

        PR C++/34715
        * decl.c (duplicate_decls): Merge DECL_DISREGARD_INLINE_LIMITS for
        template decls' function decl.

2008-02-22  Andrew Pinski  <andrew_pinski@playstation.sony.com>

        PR C++/34715
        * g++.dg/ext/always_inline-1.C: New test.
        * g++.dg/ext/always_inline-2.C: New test.
        * g++.dg/ext/always_inline-3.C: New test.
        * g++.dg/ext/always_inline-4.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132558 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 19c34ba..19709c1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       PR C++/34715
+       * decl.c (duplicate_decls): Merge DECL_DISREGARD_INLINE_LIMITS for
+       template decls' function decl.
+
 2008-02-22  Paolo Carlini  <pcarlini@suse.de>
 
        PR c++/35282

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7294930..82c55e0 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1675,6 +1675,9 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
                = DECL_INTERFACE_KNOWN (new_result);
              DECL_DECLARED_INLINE_P (old_result)
                = DECL_DECLARED_INLINE_P (new_result);
+             DECL_DISREGARD_INLINE_LIMITS (old_result)
+               |= DECL_DISREGARD_INLINE_LIMITS (new_result);
+
            }
          else
            {
@@ -1682,6 +1685,8 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
                |= DECL_INLINE (new_result);
              DECL_DECLARED_INLINE_P (old_result)
                |= DECL_DECLARED_INLINE_P (new_result);
+             DECL_DISREGARD_INLINE_LIMITS (old_result)
+               |= DECL_DISREGARD_INLINE_LIMITS (new_result);
              check_redeclaration_exception_specification (newdecl, olddecl);
            }
        }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9842305..378f04b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-22  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       PR C++/34715
+       * g++.dg/ext/always_inline-1.C: New test.
+       * g++.dg/ext/always_inline-2.C: New test.
+       * g++.dg/ext/always_inline-3.C: New test.
+       * g++.dg/ext/always_inline-4.C: New test.
+
 2008-02-22  Hans-Peter Nilsson  <hp@axis.com>
 
        * gcc.target/cris/asm-b-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/ext/always_inline-1.C b/gcc/testsuite/g++.dg/ext/always_inline-1.C
new file mode 100644 (file)
index 0000000..284fd17
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/always_inline-1.C
@@ -0,0 +1,26 @@
+// { dg-options "-O0" }
+// { dg-do compile }
+// PR C++/34715
+
+
+namespace X
+{
+ template <class T>
+ const T& min(const T& a, const T& b);
+
+ template <class T>
+ inline __attribute__ ((always_inline)) const T& min(const T& a, const T& b)
+ {
+  return a < b ? a : b;
+ }
+}
+template <class T>
+inline __attribute__ ((always_inline)) T y(const T& a, const T& b)
+{
+ return X::min(a, b);
+}
+int main()
+{
+ int a = 0, b = 0;
+ return y(a, b);
+}

diff --git a/gcc/testsuite/g++.dg/ext/always_inline-2.C b/gcc/testsuite/g++.dg/ext/always_inline-2.C
new file mode 100644 (file)
index 0000000..31123c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/always_inline-2.C
@@ -0,0 +1,26 @@
+// { dg-options "-O0" }
+// { dg-do compile }
+// PR C++/34715
+
+
+namespace X
+{
+ template <class T>
+ const T& min123(const T& a, const T& b);
+}
+
+
+template <class T>
+inline __attribute__ ((always_inline)) const T& X::min123(const T& a, const T& b)
+{
+ return a < b ? a : b;
+}
+int main()
+{
+ int a, b;
+ return X::min123(a, b);
+}
+
+
+
+// { dg-final { scan-assembler-not "min123" } }

diff --git a/gcc/testsuite/g++.dg/ext/always_inline-3.C b/gcc/testsuite/g++.dg/ext/always_inline-3.C
new file mode 100644 (file)
index 0000000..e008932
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/always_inline-3.C
@@ -0,0 +1,26 @@
+// { dg-options "-O0" }
+// { dg-do compile }
+// PR C++/34715
+
+
+namespace X
+{
+ template <class T>
+ inline __attribute__ ((always_inline)) const T& min123(const T& a, const T& b);
+}
+
+
+template <class T>
+inline __attribute__ ((always_inline)) const T& X::min123(const T& a, const T& b)
+{
+ return a < b ? a : b;
+}
+int main()
+{
+ int a, b;
+ return X::min123(a, b);
+}
+
+
+
+// { dg-final { scan-assembler-not "min123" } }

diff --git a/gcc/testsuite/g++.dg/ext/always_inline-4.C b/gcc/testsuite/g++.dg/ext/always_inline-4.C
new file mode 100644 (file)
index 0000000..e950761
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/always_inline-4.C
@@ -0,0 +1,20 @@
+// { dg-options "-O0" }
+// { dg-do compile }
+// PR C++/34715
+
+ template <class T>
+ const T& min123(const T& a, const T& b);
+template <class T>
+inline __attribute__ ((always_inline)) const T& 
+min123(const T& a, const T& b)
+{
+ return a < b ? a : b;
+}
+int main()
+{
+ int a, b;
+ return min123(a, b);
+}
+
+
+// { dg-final { scan-assembler-not "min123" } }