<div dir="ltr">This commit was reverting an earlier commit; nothing was being added. But yes, Richard's test case would be part of the revised version once I get the patch working properly.</div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Tue, Nov 5, 2013 at 8:13 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">Should you add Richard's test case too?<div><br></div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 5, 2013 at 10:28 AM, Kaelyn Uhrain <span dir="ltr"><<a href="mailto:rikka@google.com" target="_blank">rikka@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: rikka<br>
Date: Tue Nov 5 12:28:21 2013<br>
New Revision: 194088<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=194088&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=194088&view=rev</a><br>
Log:<br>
Revert "Try to correct a mistyped "-" or ">" to "->" for some C++ cases."<br>
<br>
Revert this patch until cases of rejected valid code (e.g. identifiers<br>
that require ADL to be resolved properly) are fixed.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td<br>
cfe/trunk/lib/Parse/ParseExpr.cpp<br>
cfe/trunk/test/SemaCXX/member-expr.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=194088&r1=194087&r2=194088&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=194088&r1=194087&r2=194088&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Tue Nov 5 12:28:21 2013<br>
@@ -499,9 +499,6 @@ def ext_abstract_pack_declarator_parens<br>
def err_function_is_not_record : Error<<br>
"unexpected '%select{.|->}0' in function call; perhaps remove the "<br>
"'%select{.|->}0'?">;<br>
-def err_mistyped_arrow_in_member_access : Error<<br>
- "use of undeclared identifier %0; did you mean '->' instead of "<br>
- "'%select{-|>}1'?">;<br>
<br>
// C++ derived classes<br>
def err_dup_virtual : Error<"duplicate 'virtual' in base specifier">;<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=194088&r1=194087&r2=194088&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=194088&r1=194087&r2=194088&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Tue Nov 5 12:28:21 2013<br>
@@ -166,46 +166,6 @@ ExprResult Parser::ParseAssignmentExpres<br>
ExprResult LHS = ParseCastExpression(/*isUnaryExpression=*/false,<br>
/*isAddressOfOperand=*/false,<br>
isTypeCast);<br>
-<br>
- // Check for a possible typo of "-" or ">" instead of "->" after a<br>
- // pointer to a struct or class, while recovery is still possible.<br>
- if (LHS.isUsable() && (Tok.is(tok::minus) || Tok.is(tok::greater))) {<br>
- QualType LHSType = LHS.get()->getType();<br>
- const RecordType *Pointee =<br>
- LHSType->isPointerType()<br>
- ? LHSType->getPointeeType()->getAsStructureType()<br>
- : 0;<br>
- const RecordDecl *RD = Pointee ? Pointee->getDecl() : 0;<br>
- const Token &NextTok = NextToken();<br>
- if (RD && NextTok.is(tok::identifier)) {<br>
- UnqualifiedId Name;<br>
- CXXScopeSpec ScopeSpec;<br>
- SourceLocation TemplateKWLoc;<br>
- NoTypoCorrectionCCC NoTCValidator;<br>
- Name.setIdentifier(NextTok.getIdentifierInfo(), NextTok.getLocation());<br>
- Sema::SFINAETrap Trap(Actions);<br>
- ExprResult Res =<br>
- Actions.ActOnIdExpression(getCurScope(), ScopeSpec, TemplateKWLoc,<br>
- Name, false, false, &NoTCValidator);<br>
- if (Res.isInvalid()) {<br>
- Token OpTok = Tok;<br>
- Tok.setKind(tok::arrow);<br>
- PP.EnableBacktrackAtThisPos();<br>
- Res = ParsePostfixExpressionSuffix(LHS);<br>
- if (Res.isUsable()) {<br>
- LHS = Res;<br>
- PP.CommitBacktrackedTokens();<br>
- Diag(OpTok, diag::err_mistyped_arrow_in_member_access)<br>
- << NextTok.getIdentifierInfo() << OpTok.is(tok::greater)<br>
- << FixItHint::CreateReplacement(OpTok.getLocation(), "->");<br>
- } else {<br>
- Tok = OpTok;<br>
- PP.Backtrack();<br>
- }<br>
- }<br>
- }<br>
- }<br>
-<br>
return ParseRHSOfBinaryExpression(LHS, prec::Assignment);<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/SemaCXX/member-expr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-expr.cpp?rev=194088&r1=194087&r2=194088&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-expr.cpp?rev=194088&r1=194087&r2=194088&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/member-expr.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/member-expr.cpp Tue Nov 5 12:28:21 2013<br>
@@ -224,16 +224,3 @@ namespace pr16676 {<br>
.i; // expected-error {{member reference type 'pr16676::S *' is a pointer; maybe you meant to use '->'}}<br>
}<br>
}<br>
-<br>
-namespace PR9054 {<br>
-struct Foo {<br>
- void bar(int);<br>
- int fiz;<br>
-};<br>
-<br>
-int test(struct Foo *foo) {<br>
- foo-bar(5); // expected-error {{use of undeclared identifier 'bar'; did you mean '->' instead of '-'?}}<br>
- foo>baz(4); // expected-error-re {{use of undeclared identifier 'baz'$}}<br>
- return foo>fiz; // expected-error {{use of undeclared identifier 'fiz'; did you mean '->' instead of '>'?}}<br>
-}<br>
-}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">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>
</div></div></blockquote></div><br></div>