Fix crash when using archaic protocol, rdar://10238337

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141215 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/SelectorLocationsKind.cpp b/lib/AST/SelectorLocationsKind.cpp
index 9a44b387dd8112586bd12fa432bf3b78b8e9e808..671207a7f2d9d46554c0b7f976949dcd895f9df9 100644 (file)
--- a/lib/AST/SelectorLocationsKind.cpp
+++ b/lib/AST/SelectorLocationsKind.cpp
@@ -54,8 +54,11 @@ SourceLocation getArgLoc<Expr>(Expr *Arg) {
 
 template <>
 SourceLocation getArgLoc<ParmVarDecl>(ParmVarDecl *Arg) {
+  SourceLocation Loc = Arg->getLocStart();
+  if (Loc.isInvalid())
+    return Loc;
   // -1 to point to left paren of the method parameter's type.
-  return Arg->getLocStart().getLocWithOffset(-1);
+  return Loc.getLocWithOffset(-1);
 }
 
 template <typename T>

diff --git a/test/SemaObjC/protocol-archane.m b/test/SemaObjC/protocol-archane.m
index 138c43d1a83a894b748dda8be187c839c50206b1..992d3e4798c1ad9937300e93e7d6551c19abe0eb 100644 (file)
--- a/test/SemaObjC/protocol-archane.m
+++ b/test/SemaObjC/protocol-archane.m
@@ -33,3 +33,10 @@ typedef struct objc_class *Class;
 
 Class <SomeProtocol> UnfortunateGCCExtension;
 
+// rdar://10238337
+@protocol Broken @end
+@interface Crash @end
+@implementation Crash
+- (void)crashWith:(<Broken>)a { // expected-warning {{protocol qualifiers without 'id' is archaic}}
+}
+@end