replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When typo-correction an Objective-C superclass name, don't 

typo-correct to ourselves.

llvm-svn: 145583
This commit is contained in:
Douglas Gregor 2011-12-01 15:37:53 +00:00
parent b8e6cee9ca
commit 11bb308457
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang/lib/Sema/SemaDeclObjC.cpp
View File

@ -417,10 +417,15 @@ ActOnStartClassInterface(SourceLocation AtInterfaceLoc,
DeclarationNameInfo(SuperName, SuperLoc), LookupOrdinaryName, TUScope, DeclarationNameInfo(SuperName, SuperLoc), LookupOrdinaryName, TUScope,
NULL, NULL, false, CTC_NoKeywords); NULL, NULL, false, CTC_NoKeywords);
if ((PrevDecl = Corrected.getCorrectionDeclAs<ObjCInterfaceDecl>())) { if ((PrevDecl = Corrected.getCorrectionDeclAs<ObjCInterfaceDecl>())) {
Diag(SuperLoc, diag::err_undef_superclass_suggest) if (PrevDecl == IDecl) {
<< SuperName << ClassName << PrevDecl->getDeclName(); // Don't correct to the class we're defining.
Diag(PrevDecl->getLocation(), diag::note_previous_decl) PrevDecl = 0;
<< PrevDecl->getDeclName(); } else {
Diag(SuperLoc, diag::err_undef_superclass_suggest)
<< SuperName << ClassName << PrevDecl->getDeclName();
Diag(PrevDecl->getLocation(), diag::note_previous_decl)
<< PrevDecl->getDeclName();
}
} }
} }

4
clang/test/SemaObjC/class-def-test-1.m
View File

@ -30,4 +30,6 @@ typedef NSObject TD_NSObject;
@interface XCElementUnit : TD_NSObject {} @interface XCElementUnit : TD_NSObject {}
@end @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