Skip to content

Commit

Permalink
[ObjC] Name lookup in methods shouldn't allow shadowing types (#116683)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
AreaZR committed Nov 19, 2024
1 parent 51dee6b commit 7df6033
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
11 changes: 11 additions & 0 deletions clang/lib/Parse/ParseObjc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,17 @@ Decl *Parser::ParseObjCMethodDecl(SourceLocation mLoc,
nullptr));
}

// Turn ArgInfos into parameters. This must happen after parsing all
// parameters for bug compatibility with previous versions of Clang. (For
// instance, if a method declares a parameter called "id", that parameter must
// not shadow the "id" type.)
SmallVector<ParmVarDecl *, 12> ObjCParamInfo;
for (auto &ArgInfo : ArgInfos) {
ParmVarDecl *Param = Actions.ObjC().ActOnMethodParmDeclaration(
getCurScope(), ArgInfo, ObjCParamInfo.size(), MethodDefinition);
ObjCParamInfo.push_back(Param);
}

// FIXME: Add support for optional parameter list...
// If attributes exist after the method, parse them.
MaybeParseAttributes(PAKM_CXX11 | (getLangOpts().ObjC ? PAKM_GNU : 0),
Expand Down
7 changes: 7 additions & 0 deletions clang/test/SemaObjC/method-param-named-id.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s


@interface Foo
-(void)paramNamedID:(int)id usesIDType:(id)notShadowed;
-(void)paramNamedID:(int)id, id notShadowed; // expected-warning{{use of C-style parameters in Objective-C method declarations is deprecated}}
@end

0 comments on commit 7df6033

Please sign in to comment.