<div class="gmail_quote">On Wed, Apr 11, 2012 at 4:29 PM, David Chisnall <span dir="ltr"><<a href="mailto:csdavec@swan.ac.uk">csdavec@swan.ac.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: theraven<br>
Date: Wed Apr 11 10:29:15 2012<br>
New Revision: 154499<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=154499&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=154499&view=rev</a><br>
Log:<br>
Allow c++ initialisers to initialise _Atomic fields.<br>
<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/atomicinit.cpp<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaOverload.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaOverload.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=154499&r1=154498&r2=154499&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=154499&r1=154498&r2=154499&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Wed Apr 11 10:29:15 2012<br>
@@ -1316,6 +1316,13 @@<br>
   SCS.setFromType(FromType);<br>
   SCS.CopyConstructor = 0;<br>
<br>
+  // Allow conversion to _Atomic types.  These are C11 and are provided as an<br>
+  // extension in C++ mode.<br></blockquote><div><br></div><div>It seems like this should get an ext-warn...</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+  if (const AtomicType *ToAtomicType = ToType->getAs<AtomicType>()) {<br>
+    if (ToAtomicType->getValueType() == FromType)<br>
+      return true;<br>
+  }<br>
+<br>
   // There are no standard conversions for class types in C++, so<br>
   // abort early. When overloading in C, however, we do permit<br>
   if (FromType->isRecordType() || ToType->isRecordType()) {<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/atomicinit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/atomicinit.cpp?rev=154499&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/atomicinit.cpp?rev=154499&view=auto</a><br>

==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/atomicinit.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/atomicinit.cpp Wed Apr 11 10:29:15 2012<br></blockquote><div><br></div><div>Is there not an existing test for _Atomic as used in C++ that this could be folded into?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

@@ -0,0 +1,12 @@<br>
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-apple-darwin9 | FileCheck %s<br>
+struct A {<br>
+  _Atomic(int) i;<br>
+  A(int j);<br>
+  void v(int j);<br>
+};<br>
+// Storing to atomic values should be atomic<br>
+// CHECK: store atomic i32<br>
+void A::v(int j) { i = j; }<br>
+// Initialising atomic values should not be atomic<br>
+// CHECK-NOT: store atomic<br>
+A::A(int j) : i(j) {}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>