diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-12-01 15:37:53 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-12-01 15:37:53 +0000 |
| commit | 11bb3084575f9d545f7030bf6a98682becf6f1ef (patch) | |
| tree | 7bb1cda580226fcd9ec977702c548efcc7e19598 | |
| parent | b8e6cee9cadfe1e2704e3e0575e803870224c4b6 (diff) | |
| download | bcm5719-llvm-11bb3084575f9d545f7030bf6a98682becf6f1ef.tar.gz bcm5719-llvm-11bb3084575f9d545f7030bf6a98682becf6f1ef.zip | |
When typo-correction an Objective-C superclass name, don't
typo-correct to ourselves.
llvm-svn: 145583
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 13 | ||||
| -rw-r--r-- | clang/test/SemaObjC/class-def-test-1.m | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 667a12fea44..49fcfbf2f37 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -417,10 +417,15 @@ ActOnStartClassInterface(SourceLocation AtInterfaceLoc, DeclarationNameInfo(SuperName, SuperLoc), LookupOrdinaryName, TUScope, NULL, NULL, false, CTC_NoKeywords); if ((PrevDecl = Corrected.getCorrectionDeclAs<ObjCInterfaceDecl>())) { - Diag(SuperLoc, diag::err_undef_superclass_suggest) - << SuperName << ClassName << PrevDecl->getDeclName(); - Diag(PrevDecl->getLocation(), diag::note_previous_decl) - << PrevDecl->getDeclName(); + if (PrevDecl == IDecl) { + // Don't correct to the class we're defining. + PrevDecl = 0; + } else { + Diag(SuperLoc, diag::err_undef_superclass_suggest) + << SuperName << ClassName << PrevDecl->getDeclName(); + Diag(PrevDecl->getLocation(), diag::note_previous_decl) + << PrevDecl->getDeclName(); + } } } diff --git a/clang/test/SemaObjC/class-def-test-1.m b/clang/test/SemaObjC/class-def-test-1.m index 95a259bd527..0d114b99fb6 100644 --- a/clang/test/SemaObjC/class-def-test-1.m +++ b/clang/test/SemaObjC/class-def-test-1.m @@ -30,4 +30,6 @@ typedef NSObject TD_NSObject; @interface XCElementUnit : TD_NSObject {} @end - +// Make sure we don't typo-correct to ourselves. +@interface SomeClassSub : SomeClassSup // expected-error{{cannot find interface declaration for 'SomeClassSup', superclass of 'SomeClassSub'}} +@end |
