commit 9ea8efaf92570d708494ea352d3e5c21f0fe0ea7
author Nick Lewycky <nicholas@mxc.ca> Mon Jun 23 22:57:51 2014 +0000
committer Nick Lewycky <nicholas@mxc.ca> Mon Jun 23 22:57:51 2014 +0000
tree e1d57e75b20e5c93edefef1f32adce3d9ccf1812
parent 4377656e1236c0f29a453c3bbeb6abed51eb0d52

Propagate isAddressOfMember into typo correction so that we don't correct &qualified-id into &unqualified-id. Also make sure to set the naming class when we find the qualified-id in a different class than the nested name specifier specified so far. Fixes PR19681!

llvm-svn: 211551

clang/lib/Parse/ParseExpr.cpp

diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index b238157..3fea464 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -435,7 +435,8 @@
 
     if (isa<TypeDecl>(ND))
       return WantTypeSpecifiers;
-    return AllowNonTypes;
+    return AllowNonTypes &&
+           CorrectionCandidateCallback::ValidateCandidate(candidate);
   }
 
  private:
@@ -813,6 +814,7 @@
     SourceLocation TemplateKWLoc;
     CastExpressionIdValidator Validator(isTypeCast != NotTypeCast,
                                         isTypeCast != IsTypeCast);
+    Validator.IsAddressOfOperand = isAddressOfOperand;
     Name.setIdentifier(&II, ILoc);
     Res = Actions.ActOnIdExpression(getCurScope(), ScopeSpec, TemplateKWLoc,
                                     Name, Tok.is(tok::l_paren),