PR lto/49123

	* fold-const.c (constant_boolean_node): If type is non-NULL,
	use build_int_cst_type instead of build_int_cst.

	* gcc.c-torture/execute/pr49123.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@174087 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b5c1e9..9e4b0f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-23  Jakub Jelinek  <jakub@redhat.com>
 
+       PR lto/49123
+       * fold-const.c (constant_boolean_node): If type is non-NULL,
+       use build_int_cst_type instead of build_int_cst.
+
        PR debug/49032
        * dbxout.c: Include cgraph.h.
        (dbxout_expand_expr): If a VAR_DECL is TREE_STATIC, not written

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 053ae30..51be79d 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -5953,8 +5953,10 @@ constant_boolean_node (int value, tree type)
     return value ? integer_one_node : integer_zero_node;
   else if (type == boolean_type_node)
     return value ? boolean_true_node : boolean_false_node;
+  else if (type)
+    return build_int_cst_type (type, value);
   else
-    return build_int_cst (type, value);
+    return build_int_cst (NULL_TREE, value);
 }
 
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9757477..780e52d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-23  Jakub Jelinek  <jakub@redhat.com>
 
+       PR lto/49123
+       * gcc.c-torture/execute/pr49123.c: New test.
+
        PR debug/49032
        * gcc.dg/debug/pr49032.c: New test.
 

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr49123.c b/gcc/testsuite/gcc.c-torture/execute/pr49123.c
new file mode 100644 (file)
index 0000000..2f1f793
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr49123.c
@@ -0,0 +1,14 @@
+/* PR lto/49123 */
+
+extern void abort (void);
+static struct S { int f : 1; } s;
+static int v = -1;
+
+int
+main ()
+{
+  s.f = v < 0;
+  if ((unsigned int) s.f != -1U)
+    abort ();
+  return 0;
+}