Patchwork die CRs

Index: gcc.dg/tree-ssa/vrp60.c
===================================================================
--- gcc.dg/tree-ssa/vrp60.c	(revision 186258)
+++ gcc.dg/tree-ssa/vrp60.c	(revision 186260)
@@ -1,31 +1,31 @@ 
-/* { dg-do compile } */

-/* { dg-options "-O2 -fno-tree-ccp -fno-tree-dominator-opts -fdump-tree-vrp1" } */

-

-int foo (int x, int b)

-{

-  int cst;

-  if (b)

-    cst = -__INT_MAX__ - 1;

-  else

-    cst = -__INT_MAX__;

-  x = x | cst;

-  if (x >= 0)

-    return 12345;

-  return x;

-}

-

-int bar (int x, int b)

-{

-  int cst;

-  if (b)

-    cst = __INT_MAX__;

-  else

-    cst = __INT_MAX__ - 1;

-  x = x & cst;

-  if (x < 0)

-    return 12345;

-  return x;

-}

-

-/* { dg-final { scan-tree-dump-not "12345" "vrp1" } } */

-/* { dg-final { cleanup-tree-dump "vrp1" } } */

+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-tree-ccp -fno-tree-dominator-opts -fdump-tree-vrp1" } */
+
+int foo (int x, int b)
+{
+  int cst;
+  if (b)
+    cst = -__INT_MAX__ - 1;
+  else
+    cst = -__INT_MAX__;
+  x = x | cst;
+  if (x >= 0)
+    return 12345;
+  return x;
+}
+
+int bar (int x, int b)
+{
+  int cst;
+  if (b)
+    cst = __INT_MAX__;
+  else
+    cst = __INT_MAX__ - 1;
+  x = x & cst;
+  if (x < 0)
+    return 12345;
+  return x;
+}
+
+/* { dg-final { scan-tree-dump-not "12345" "vrp1" } } */
+/* { dg-final { cleanup-tree-dump "vrp1" } } */
Index: gcc.dg/tree-ssa/vrp59.c
===================================================================
--- gcc.dg/tree-ssa/vrp59.c	(revision 186258)
+++ gcc.dg/tree-ssa/vrp59.c	(revision 186260)
@@ -1,35 +1,35 @@ 
-/* { dg-do compile } */

-/* { dg-options "-O2 -fno-tree-ccp -fdump-tree-vrp1" } */

-

-int f(int x)

-{

-  if (x >= 0 && x <= 3)

-    {

-      x = x ^ 3;

-      x = x & 3;

-    }

-  return x;

-}

-

-int g(int x)

-{

-  if (x >= 0 && x <= 3)

-    {

-      x = x ^ 2;

-      x = x & 3;

-    }

-  return x;

-}

-

-int h(int x)

-{

-  if (x >= 0 && x <= 3)

-    {

-      x = x ^ 1;

-      x = x & 3;

-    }

-  return x;

-}

-

-/* { dg-final { scan-tree-dump-not " & 3;" "vrp1" } } */

-/* { dg-final { cleanup-tree-dump "vrp1" } } */

+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-tree-ccp -fdump-tree-vrp1" } */
+
+int f(int x)
+{
+  if (x >= 0 && x <= 3)
+    {
+      x = x ^ 3;
+      x = x & 3;
+    }
+  return x;
+}
+
+int g(int x)
+{
+  if (x >= 0 && x <= 3)
+    {
+      x = x ^ 2;
+      x = x & 3;
+    }
+  return x;
+}
+
+int h(int x)
+{
+  if (x >= 0 && x <= 3)
+    {
+      x = x ^ 1;
+      x = x & 3;
+    }
+  return x;
+}
+
+/* { dg-final { scan-tree-dump-not " & 3;" "vrp1" } } */
+/* { dg-final { cleanup-tree-dump "vrp1" } } */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 186258)
+++ ChangeLog	(revision 186260)
@@ -1,5 +1,9 @@ 
 2012-04-09  Mike Stump  <mikestump@comcast.net>
 
+	* g++.dg/cpp0x/udlit-raw-op.C: Don't use CRLF endings.
+	* gcc.dg/tree-ssa/vrp59.c: Likewise.
+	* gcc.dg/tree-ssa/vrp60.c: Likewise.
+
 	* gcc.dg/dll-8.c: Remove execute permissions.
 	* g++.dg/ext/dllexport5.C: Likewise.
 
Index: g++.dg/cpp0x/udlit-raw-op.C
===================================================================
--- g++.dg/cpp0x/udlit-raw-op.C	(revision 186258)
+++ g++.dg/cpp0x/udlit-raw-op.C	(revision 186260)
@@ -1,21 +1,21 @@ 
-// { dg-do run }

-// { dg-options "-std=c++0x" }

-

-#include <cassert>

-#include <cstring>

-

-int

-operator"" _raw_umber(const char * str)

-{

-  return strlen(str);

-}

-

-int

-main()

-{

-  int i = 0123012301230123012301230123012301230123012301230123012301230123_raw_umber;

-  assert( i == 64 );

-

-  int j = 90123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789_raw_umber;

-  assert( j == 101 );

-}

+// { dg-do run }
+// { dg-options "-std=c++0x" }
+
+#include <cassert>
+#include <cstring>
+
+int
+operator"" _raw_umber(const char * str)
+{
+  return strlen(str);
+}
+
+int
+main()
+{
+  int i = 0123012301230123012301230123012301230123012301230123012301230123_raw_umber;
+  assert( i == 64 );
+
+  int j = 90123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789_raw_umber;
+  assert( j == 101 );
+}