Skip to content

Commit 7df6033

Browse files
committed
[ObjC] Name lookup in methods shouldn't allow shadowing types (llvm#116683)
Arguably as a bug, Clang has previously not mixed up Objective-C parameter names with types. This allows developers to write parameter names that _should_ shadow type names, but don't. For instance: @interface Foo -(void)foo:(int)id bar:(id)name; // OK @EnD Commit 9778808 changed the way that parameters are parsed to bring it more in line with how C parameters are parsed, but it breaks the example above. Given an expectation that the change wouldn't introduce source breaks, this is not something we can go forward with. 9778808 did this so that late-parsed attributes could reference Objective-C parameters. This change buffers Objective-C parameter info until after all parameters are parsed and turns them into parameter declarations before realizing late-parsed attributes instead. Radar-ID: 139996306 (cherry picked from commit 8bdf13b)
1 parent 51dee6b commit 7df6033

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

clang/lib/Parse/ParseObjc.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,17 @@ Decl *Parser::ParseObjCMethodDecl(SourceLocation mLoc,
15541554
nullptr));
15551555
}
15561556

1557+
// Turn ArgInfos into parameters. This must happen after parsing all
1558+
// parameters for bug compatibility with previous versions of Clang. (For
1559+
// instance, if a method declares a parameter called "id", that parameter must
1560+
// not shadow the "id" type.)
1561+
SmallVector<ParmVarDecl *, 12> ObjCParamInfo;
1562+
for (auto &ArgInfo : ArgInfos) {
1563+
ParmVarDecl *Param = Actions.ObjC().ActOnMethodParmDeclaration(
1564+
getCurScope(), ArgInfo, ObjCParamInfo.size(), MethodDefinition);
1565+
ObjCParamInfo.push_back(Param);
1566+
}
1567+
15571568
// FIXME: Add support for optional parameter list...
15581569
// If attributes exist after the method, parse them.
15591570
MaybeParseAttributes(PAKM_CXX11 | (getLangOpts().ObjC ? PAKM_GNU : 0),
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
2+
3+
4+
@interface Foo
5+
-(void)paramNamedID:(int)id usesIDType:(id)notShadowed;
6+
-(void)paramNamedID:(int)id, id notShadowed; // expected-warning{{use of C-style parameters in Objective-C method declarations is deprecated}}
7+
@end

0 commit comments

Comments
 (0)