<div class="gmail_extra"><div class="gmail_quote">On Mon, Apr 23, 2012 at 9:45 AM, DeLesley Hutchins <span dir="ltr"><<a href="mailto:delesley@google.com" target="_blank">delesley@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: delesley<br>
Date: Mon Apr 23 11:45:01 2012<br>
New Revision: 155357<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=155357&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=155357&view=rev</a><br>
Log:<br>
Thread-safety analysis: support new "pointer to member" syntax for<br>
existentially quantified lock expressions.<br></blockquote><div><br></div><div>Come again? ;]</div><div><br></div><div>Also, should this new syntax also get new documentation?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaDeclAttr.cpp<br>
    cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=155357&r1=155356&r2=155357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=155357&r1=155356&r2=155357&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Mon Apr 23 11:45:01 2012<br>
@@ -313,7 +313,11 @@<br>
       continue;<br>
     }<br>
<br>
-    if (isa<StringLiteral>(ArgExp)) {<br>
+    if (StringLiteral *StrLit = dyn_cast<StringLiteral>(ArgExp)) {<br>
+      // Ignore empty strings without warnings<br></blockquote><div><br></div><div>This seems an unrelated change, was it intentional? Test case?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+      if (StrLit->getLength() == 0)<br>
+        continue;<br>
+<br>
       // We allow constant strings to be used as a placeholder for expressions<br>
       // that are not valid C++ syntax, but warn that they are ignored.<br>
       S.Diag(Attr.getLoc(), diag::warn_thread_attribute_ignored) <<<br>
@@ -323,6 +327,14 @@<br>
<br>
     QualType ArgTy = ArgExp->getType();<br>
<br>
+    // A pointer to member expression of the form  &MyClass::mu is treated<br>
+    // specially -- we need to look at the type of the member.<br>
+    if (UnaryOperator *UOp = dyn_cast<UnaryOperator>(ArgExp))<br>
+      if (UOp->getOpcode() == UO_AddrOf)<br>
+        if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(UOp->getSubExpr()))<br>
+          if (DRE->getDecl()->isCXXInstanceMember())<br>
+            ArgTy = DRE->getDecl()->getType();<br>
+<br>
     // First see if we can just cast to record type, or point to record type.<br>
     const RecordType *RT = getRecordType(ArgTy);<br>
<br>
<br>
Modified: cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp?rev=155357&r1=155356&r2=155357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp?rev=155357&r1=155356&r2=155357&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp Mon Apr 23 11:45:01 2012<br>
@@ -1341,5 +1341,20 @@<br>
<br>
 }<br>
<br>
+namespace PointerToMemberTest {<br>
+<br>
+class Graph {<br>
+public:<br>
+  Mu mu_;<br>
+};<br>
+<br>
+class Node {<br>
+public:<br>
+  void foo() EXCLUSIVE_LOCKS_REQUIRED(&Graph::mu_);<br>
+  int a GUARDED_BY(&Graph::mu_);<br>
+};<br>
+<br>
+}<br>
+<br>
 } // end namespace TestMultiDecl<br><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></div>