Patchwork PING [PATCH] Fix PR libstdc++/54036, problem negating DFP NaNs

login
register
mail settings
Submitter Peter Bergner
Date Aug. 3, 2012, 5 a.m.
Message ID <20120803000059.52337dce6ecbb94a42534bc5@vnet.ibm.com>
Download mbox | patch
Permalink /patch/174879/
State New
Headers show

Comments

Peter Bergner - Aug. 3, 2012, 5 a.m.
On Thu, 02 Aug 2012 11:36:42 Paolo Carlini wrote:
> > Also, is this ok for the 4.6 and 4.7 release branches?
> I don't think this is a regression, thus I would say 4.7 only, to be safe.

Ok.


> we don't have a separate ChangeLog in libstdc++-v3/testsuite/. Thus a 
> single ChangeLog entry for everything.

Fixed.


> > Index: libstdc++-v3/testsuite/decimal/pr54036-1.cc
> > ===================================================================
> > --- libstdc++-v3/testsuite/decimal/pr54036-1.cc	(revision 0)
> > +++ libstdc++-v3/testsuite/decimal/pr54036-1.cc	(revision 0)
> > @@ -0,0 +1,56 @@
> Copyright blurb missing. Also, you need:
> 
> // { dg-require-effective-target dfp }

Fixed.


> In the library testsuite we include:
> 
> #include <testsuite_hooks.h>
> 
> and then we use VERIFY not __builtin_abort. Also, for decimal, we 
> normally use:
> 
> using namespace std::decimal.

Fixed.

Ok, once more with feeling! :)  How about the updated patched below?
...and thank you for the gentle review.  This is my first libstdc++
patch and I guess I was used to the normal gcc/testsuite/ tests
that don't include copyright headers and the like.  I'll try to
be more careful in the future.

Peter


libstdc++-v3/
	PR libstdc++/54036
	* include/decimal/decimal.h (_DEFINE_DECIMAL_UNARY_OP): Use _Op as
	a unary operator.
	* testsuite/decimal/pr54036-1.cc: New test.
	* testsuite/decimal/pr54036-2.cc: Likewise.
	* testsuite/decimal/pr54036-3.cc: Likewise.
Paolo Carlini - Aug. 3, 2012, 9:28 a.m.
Hi,

On 08/03/2012 07:00 AM, Peter Bergner wrote:
> Fixed.
>
> Ok, once more with feeling! :)  How about the updated patched below?
> ...and thank you for the gentle review.  This is my first libstdc++
> patch and I guess I was used to the normal gcc/testsuite/ tests
> that don't include copyright headers and the like.  I'll try to
> be more careful in the future.
No problem ;) Patch is Ok, thanks!

Paolo.
Peter Bergner - Aug. 13, 2012, 10:14 p.m.
On 08/03/2012 11:28:57 +0200 Paolo Carlini wrote:
> No problem ;) Patch is Ok, thanks!

Hi Paolo,

I see you committed the patch for me.  Thanks!!  I literally posted
that last patch just minutes before heading out on vacation and didn't
want to commit it just before I left in case it caused any fallout.
Thanks again for your reviews and committing the patch for me!

Peter

Patch

Index: libstdc++-v3/include/decimal/decimal.h
===================================================================
--- libstdc++-v3/include/decimal/decimal.h	(revision 189599)
+++ libstdc++-v3/include/decimal/decimal.h	(working copy)
@@ -288,7 +288,7 @@ 
   inline _Tp operator _Op(_Tp __rhs)		\
   {						\
     _Tp __tmp;					\
-    __tmp.__setval(0 _Op __rhs.__getval());	\
+    __tmp.__setval(_Op __rhs.__getval());	\
     return __tmp;				\
   }
 
Index: libstdc++-v3/testsuite/decimal/pr54036-1.cc
===================================================================
--- libstdc++-v3/testsuite/decimal/pr54036-1.cc	(revision 0)
+++ libstdc++-v3/testsuite/decimal/pr54036-1.cc	(revision 0)
@@ -0,0 +1,70 @@ 
+// Copyright (C) 2012 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-require-effective-target dfp }
+
+#include <decimal/decimal>
+#include <testsuite_hooks.h>
+
+using namespace std::decimal;
+
+decimal32
+__attribute__ ((noinline))
+my_nan32 (void)
+{
+  decimal32 z = 0;
+  decimal32 v = z/z;
+  return v;
+}
+
+decimal32
+__attribute__ ((noinline))
+my_inf32 (void)
+{
+  decimal32 o = 1;
+  decimal32 z = 0;
+  decimal32 v = o/z;
+  return v;
+}
+
+int
+main (void)
+{
+  decimal32 v;
+
+  v = my_nan32 ();
+
+  VERIFY (__builtin_isnand32 (v.__getval ()));
+  VERIFY (!__builtin_signbitd32 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isnand32 (v.__getval ()));
+  VERIFY (__builtin_signbitd32 (v.__getval ()))
+
+  v = my_inf32 ();
+
+  VERIFY (__builtin_isinfd32 (v.__getval ()));
+  VERIFY (!__builtin_signbitd32 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isinfd32 (v.__getval ()));
+  VERIFY (__builtin_signbitd32 (v.__getval ()))
+
+  return 0;
+}
Index: libstdc++-v3/testsuite/decimal/pr54036-2.cc
===================================================================
--- libstdc++-v3/testsuite/decimal/pr54036-2.cc	(revision 0)
+++ libstdc++-v3/testsuite/decimal/pr54036-2.cc	(revision 0)
@@ -0,0 +1,70 @@ 
+// Copyright (C) 2012 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-require-effective-target dfp }
+
+#include <decimal/decimal>
+#include <testsuite_hooks.h>
+
+using namespace std::decimal;
+
+decimal64
+__attribute__ ((noinline))
+my_nan64 (void)
+{
+  decimal64 z = 0;
+  decimal64 v = z/z;
+  return v;
+}
+
+decimal64
+__attribute__ ((noinline))
+my_inf64 (void)
+{
+  decimal64 o = 1;
+  decimal64 z = 0;
+  decimal64 v = o/z;
+  return v;
+}
+
+int
+main (void)
+{
+  decimal64 v;
+
+  v = my_nan64 ();
+
+  VERIFY (__builtin_isnand64 (v.__getval ()));
+  VERIFY (!__builtin_signbitd64 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isnand64 (v.__getval ()));
+  VERIFY (__builtin_signbitd64 (v.__getval ()))
+
+  v = my_inf64 ();
+
+  VERIFY (__builtin_isinfd64 (v.__getval ()));
+  VERIFY (!__builtin_signbitd64 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isinfd64 (v.__getval ()));
+  VERIFY (__builtin_signbitd64 (v.__getval ()))
+
+  return 0;
+}
Index: libstdc++-v3/testsuite/decimal/pr54036-3.cc
===================================================================
--- libstdc++-v3/testsuite/decimal/pr54036-3.cc	(revision 0)
+++ libstdc++-v3/testsuite/decimal/pr54036-3.cc	(revision 0)
@@ -0,0 +1,70 @@ 
+// Copyright (C) 2012 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-require-effective-target dfp }
+
+#include <decimal/decimal>
+#include <testsuite_hooks.h>
+
+using namespace std::decimal;
+
+decimal128
+__attribute__ ((noinline))
+my_nan128 (void)
+{
+  decimal128 z = 0;
+  decimal128 v = z/z;
+  return v;
+}
+
+decimal128
+__attribute__ ((noinline))
+my_inf128 (void)
+{
+  decimal128 o = 1;
+  decimal128 z = 0;
+  decimal128 v = o/z;
+  return v;
+}
+
+int
+main (void)
+{
+  decimal128 v;
+
+  v = my_nan128 ();
+
+  VERIFY (__builtin_isnand128 (v.__getval ()));
+  VERIFY (!__builtin_signbitd128 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isnand128 (v.__getval ()));
+  VERIFY (__builtin_signbitd128 (v.__getval ()))
+
+  v = my_inf128 ();
+
+  VERIFY (__builtin_isinfd128 (v.__getval ()));
+  VERIFY (!__builtin_signbitd128 (v.__getval ()))
+
+  v = -v;
+
+  VERIFY (__builtin_isinfd128 (v.__getval ()));
+  VERIFY (__builtin_signbitd128 (v.__getval ()))
+
+  return 0;
+}