diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7dd7717fdeaf..cd51a9fbcccc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/52177
+	* builtins.c (fold_builtin_atomic_always_lock_free,
+	expand_builtin_atomic_always_lock_free,
+	fold_builtin_atomic_is_lock_free,
+	expand_builtin_atomic_is_lock_free): Return and/or test
+	boolean_true_node/boolean_false_node instead of
+	integer_one_node/integer_zero_node.
+
 2012-02-10  Jan Hubicka  <jh@suse.cz>
 
 	PR middle-end/48600
diff --git a/gcc/builtins.c b/gcc/builtins.c
index cf4956123c3b..b937d3d0938f 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -5639,15 +5639,15 @@ fold_builtin_atomic_always_lock_free (tree arg0, tree arg1)
   /* If the object has smaller alignment, the the lock free routines cannot
      be used.  */
   if (type_align < mode_align)
-    return integer_zero_node;
+    return boolean_false_node;
 
   /* Check if a compare_and_swap pattern exists for the mode which represents
      the required size.  The pattern is not allowed to fail, so the existence
      of the pattern indicates support is present.  */
   if (can_compare_and_swap_p (mode, true))
-    return integer_one_node;
+    return boolean_true_node;
   else
-    return integer_zero_node;
+    return boolean_false_node;
 }
 
 /* Return true if the parameters to call EXP represent an object which will
@@ -5671,7 +5671,7 @@ expand_builtin_atomic_always_lock_free (tree exp)
     }
 
   size = fold_builtin_atomic_always_lock_free (arg0, arg1);
-  if (size == integer_one_node)
+  if (size == boolean_true_node)
     return const1_rtx;
   return const0_rtx;
 }
@@ -5686,8 +5686,8 @@ fold_builtin_atomic_is_lock_free (tree arg0, tree arg1)
     return NULL_TREE;
   
   /* If it isn't always lock free, don't generate a result.  */
-  if (fold_builtin_atomic_always_lock_free (arg0, arg1) == integer_one_node)
-    return integer_one_node;
+  if (fold_builtin_atomic_always_lock_free (arg0, arg1) == boolean_true_node)
+    return boolean_true_node;
 
   return NULL_TREE;
 }
@@ -5717,7 +5717,7 @@ expand_builtin_atomic_is_lock_free (tree exp)
 
   /* If the value is known at compile time, return the RTX for it.  */
   size = fold_builtin_atomic_is_lock_free (arg0, arg1);
-  if (size == integer_one_node)
+  if (size == boolean_true_node)
     return const1_rtx;
 
   return NULL_RTX;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 95f1215f67be..86ea212cfae4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/52177
+	* c-c++-common/pr52177.c: New test.
+
 2012-02-10  Jan Hubicka  <jh@suse.cz>
 
 	PR middle-end/48600
diff --git a/gcc/testsuite/c-c++-common/pr52177.c b/gcc/testsuite/c-c++-common/pr52177.c
new file mode 100644
index 000000000000..165acdef29cb
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr52177.c
@@ -0,0 +1,23 @@
+/* PR middle-end/52177 */
+/* { dg-do compile } */
+/* { dg-options "-O -fno-tree-ccp" } */
+
+int *s;
+
+static inline int
+foo ()
+{
+  return sizeof (int);
+}
+
+int
+bar ()
+{
+  return __atomic_always_lock_free (foo (), s);
+}
+
+int
+baz ()
+{
+  return __atomic_is_lock_free (foo (), s);
+}