On Thu, Oct 18, 2012 at 1:29 AM, Abramo Bagnara <span dir="ltr"><<a href="mailto:abramo.bagnara@bugseng.com" target="_blank" class="cremed">abramo.bagnara@bugseng.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: abramo<br>
Date: Thu Oct 18 03:29:37 2012<br>
New Revision: 166174<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=166174&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project?rev=166174&view=rev</a><br>
Log:<br>
Fixed some corner cases due to implicit int TypeLoc and simplified the logic.<br></blockquote><div><br></div><div>Did anything ever become of the idea of writing unittests for source location corner cases like these? (Did I just drop the ball on the email thread?)</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/AST/TypeLoc.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/TypeLoc.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TypeLoc.cpp?rev=166174&r1=166173&r2=166174&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TypeLoc.cpp?rev=166174&r1=166173&r2=166174&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/TypeLoc.cpp (original)<br>
+++ cfe/trunk/lib/AST/TypeLoc.cpp Thu Oct 18 03:29:37 2012<br>
@@ -98,27 +98,38 @@<br>
<br>
SourceLocation TypeLoc::getBeginLoc() const {<br>
TypeLoc Cur = *this;<br>
+ TypeLoc LeftMost = Cur;<br>
while (true) {<br>
switch (Cur.getTypeLocClass()) {<br>
+ case Elaborated:<br>
+ LeftMost = Cur;<br>
+ break;<br>
case FunctionProto:<br>
- if (cast<FunctionProtoTypeLoc>(&Cur)->getTypePtr()->hasTrailingReturn())<br>
- return Cur.getLocalSourceRange().getBegin();<br>
+ if (cast<FunctionProtoTypeLoc>(&Cur)->getTypePtr()->hasTrailingReturn()) {<br>
+ LeftMost = Cur;<br>
+ break;<br>
+ }<br>
+ /* Fall through */<br>
+ case FunctionNoProto:<br>
+ case ConstantArray:<br>
+ case DependentSizedArray:<br>
+ case IncompleteArray:<br>
+ case VariableArray:<br>
+ // FIXME: Currently QualifiedTypeLoc does not have a source range<br>
+ case Qualified:<br>
Cur = Cur.getNextTypeLoc();<br>
- assert(!Cur.isNull());<br>
continue;<br>
-<br>
- // FIXME: Currently QualifiedTypeLoc does not have a source range<br>
- // case Qualified:<br>
- case Elaborated:<br>
- return Cur.getLocalSourceRange().getBegin();<br>
-<br>
default:<br>
- if (Cur.getNextTypeLoc().isNull())<br>
- return Cur.getLocalSourceRange().getBegin();<br>
+ if (!Cur.getLocalSourceRange().getBegin().isInvalid())<br>
+ LeftMost = Cur;<br>
Cur = Cur.getNextTypeLoc();<br>
+ if (Cur.isNull())<br>
+ break;<br>
continue;<br>
} // switch<br>
+ break;<br>
} // while<br>
+ return LeftMost.getLocalSourceRange().getBegin();<br>
}<br>
<br>
SourceLocation TypeLoc::getEndLoc() const {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" class="cremed">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>