From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 13 Feb 2012 20:12:54 +0000 (+0000)
Subject: 	PR c++/52215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f6a7cb7a10e659eef1fabaabff66ee23ad6717a;p=thirdparty%2Fgcc.git

	PR c++/52215
	* c-common.c (sync_resolve_params): Don't decide whether to convert
	or not based on TYPE_SIZE comparison, convert whenever arg_type
	is unsigned INTEGER_TYPE.

	* g++.dg/ext/atomic-1.C: New test.


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

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index b86ebe59f492..7b927b9e6001 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/52215
+	* c-common.c (sync_resolve_params): Don't decide whether to convert
+	or not based on TYPE_SIZE comparison, convert whenever arg_type
+	is unsigned INTEGER_TYPE.
+
 2012-02-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c/52118
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 8dbf6cc2d756..1d19251a65f4 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -1,6 +1,6 @@
 /* Subroutines shared by all languages that are variants of C.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -9336,10 +9336,12 @@ sync_resolve_params (location_t loc, tree orig_function, tree function,
 	  return false;
 	}
 
-      /* Only convert parameters if the size is appropriate with new format
-	 sync routines.  */
-      if (orig_format
-	  || tree_int_cst_equal (TYPE_SIZE (ptype), TYPE_SIZE (arg_type)))
+      /* Only convert parameters if arg_type is unsigned integer type with
+	 new format sync routines, i.e. don't attempt to convert pointer
+	 arguments (e.g. EXPECTED argument of __atomic_compare_exchange_n),
+	 bool arguments (e.g. WEAK argument) or signed int arguments (memmodel
+	 kinds).  */
+      if (TREE_CODE (arg_type) == INTEGER_TYPE && TYPE_UNSIGNED (arg_type))
 	{
 	  /* Ideally for the first conversion we'd use convert_for_assignment
 	     so that we get warnings for anything that doesn't match the pointer
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4e471664afab..207e5cf5e880 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/52215
+	* g++.dg/ext/atomic-1.C: New test.
+
 2012-02-13  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* gcc.c-torture/execute/pr51933.c: Modify for s390 31 bit.
diff --git a/gcc/testsuite/g++.dg/ext/atomic-1.C b/gcc/testsuite/g++.dg/ext/atomic-1.C
new file mode 100644
index 000000000000..58069c309ccf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/atomic-1.C
@@ -0,0 +1,12 @@
+// PR c++/52215
+// { dg-do compile }
+
+enum E { ZERO };
+
+int
+main ()
+{
+  E e = ZERO;
+  __atomic_compare_exchange_n (&e, &e, e, true, __ATOMIC_ACQ_REL,
+			       __ATOMIC_RELAXED);
+}