<div class="gmail_quote">On Mon, Apr 30, 2012 at 5:48 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: dblaikie<br>
Date: Mon Apr 30 19:48:43 2012<br>
New Revision: 155869<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=155869&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=155869&view=rev</a><br>
Log:<br>
Remove ref/value inconsistency in redecl_iterator.<br>
<br>
Similar to r155808 - this mistake has been made in a few iterators.<br>
<br>
Based on Chandler Carruth's feedback to r155808 I added an implicit conversion<br>
to Decl* to ease adoption/usage. Useful for the pointer comparison, but not the<br>
dyn_cast (due to template argument deduction causing the conversion not to be<br>
used) </blockquote><div><br></div><div>If you look at the LLVM iterators that do this, they also specialize a class template that allows isa and dyn_cast to work transparently. simplify_type IIRC, but I've not gone and checked.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">- there for future convenience, though. This idiom (op T* for iterators)<br>
seems to be fairly idiomatic within the LLVM codebase & I'll likely add it as I<br>
fix up the other iterators here.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/AST/DeclBase.h<br>
cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp<br>
cfe/trunk/lib/Sema/IdentifierResolver.cpp<br>
cfe/trunk/lib/Sema/SemaLookup.cpp<br>
<br>
Modified: cfe/trunk/include/clang/AST/DeclBase.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=155869&r1=155868&r2=155869&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=155869&r1=155868&r2=155869&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DeclBase.h (original)<br>
+++ cfe/trunk/include/clang/AST/DeclBase.h Mon Apr 30 19:48:43 2012<br>
@@ -692,17 +692,18 @@<br>
Decl *Starter;<br>
<br>
public:<br>
- typedef Decl* value_type;<br>
- typedef Decl* reference;<br>
- typedef Decl* pointer;<br>
+ typedef Decl value_type;<br>
+ typedef value_type& reference;<br>
+ typedef value_type* pointer;<br>
typedef std::forward_iterator_tag iterator_category;<br>
typedef std::ptrdiff_t difference_type;<br>
<br>
redecl_iterator() : Current(0) { }<br>
explicit redecl_iterator(Decl *C) : Current(C), Starter(C) { }<br>
<br>
- reference operator*() const { return Current; }<br>
+ reference operator*() const { return *Current; }<br>
pointer operator->() const { return Current; }<br>
+ operator pointer() const { return Current; }<br>
<br>
redecl_iterator& operator++() {<br>
assert(Current && "Advancing while iterator has reached end");<br>
@@ -1320,7 +1321,7 @@<br>
<br>
filtered_decl_iterator() : Current() { }<br>
<br>
- /// specific_decl_iterator - Construct a new iterator over a<br>
+ /// filtered_decl_iterator - Construct a new iterator over a<br>
/// subset of the declarations the range [C,<br>
/// end-of-declarations). If A is non-NULL, it is a pointer to a<br>
/// member function of SpecificDecl that should return true for<br>
<br>
Modified: cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp?rev=155869&r1=155868&r2=155869&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp?rev=155869&r1=155868&r2=155869&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp (original)<br>
+++ cfe/trunk/lib/ARCMigrate/TransGCAttrs.cpp Mon Apr 30 19:48:43 2012<br>
@@ -166,7 +166,7 @@<br>
<br>
for (Decl::redecl_iterator<br>
I = D->redecls_begin(), E = D->redecls_end(); I != E; ++I)<br>
- if (!isInMainFile((*I)->getLocation()))<br>
+ if (!isInMainFile(I->getLocation()))<br>
return false;<br>
<br>
return true;<br>
<br>
Modified: cfe/trunk/lib/Sema/IdentifierResolver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/IdentifierResolver.cpp?rev=155869&r1=155868&r2=155869&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/IdentifierResolver.cpp?rev=155869&r1=155868&r2=155869&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/IdentifierResolver.cpp (original)<br>
+++ cfe/trunk/lib/Sema/IdentifierResolver.cpp Mon Apr 30 19:48:43 2012<br>
@@ -304,7 +304,7 @@<br>
for (Decl::redecl_iterator RD = New->redecls_begin(),<br>
RDEnd = New->redecls_end();<br>
RD != RDEnd; ++RD) {<br>
- if (*RD == Existing)<br>
+ if (RD == Existing)<br>
return DMK_Replace;<br>
<br>
if (RD->isCanonicalDecl())<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaLookup.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=155869&r1=155868&r2=155869&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=155869&r1=155868&r2=155869&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Mon Apr 30 19:48:43 2012<br>
@@ -1069,7 +1069,7 @@<br>
<br>
for (Decl::redecl_iterator RD = D->redecls_begin(), RDEnd = D->redecls_end();<br>
RD != RDEnd; ++RD) {<br>
- if (NamedDecl *ND = dyn_cast<NamedDecl>(*RD)) {<br>
+ if (NamedDecl *ND = dyn_cast<NamedDecl>(&*RD)) {<br>
if (LookupResult::isVisible(ND))<br>
return ND;<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>