@@ -772,7 +772,7 @@ class ObjCPropertyDecl : public NamedDecl {
772
772
// Synthesize ivar for this property
773
773
ObjCIvarDecl *PropertyIvarDecl = nullptr ;
774
774
775
- ObjCPropertyDecl (DeclContext *DC, SourceLocation L, IdentifierInfo *Id,
775
+ ObjCPropertyDecl (DeclContext *DC, SourceLocation L, const IdentifierInfo *Id,
776
776
SourceLocation AtLocation, SourceLocation LParenLocation,
777
777
QualType T, TypeSourceInfo *TSI, PropertyControl propControl)
778
778
: NamedDecl(ObjCProperty, DC, L, Id), AtLoc(AtLocation),
@@ -782,10 +782,12 @@ class ObjCPropertyDecl : public NamedDecl {
782
782
PropertyImplementation(propControl) {}
783
783
784
784
public:
785
- static ObjCPropertyDecl *
786
- Create (ASTContext &C, DeclContext *DC, SourceLocation L, IdentifierInfo *Id,
787
- SourceLocation AtLocation, SourceLocation LParenLocation, QualType T,
788
- TypeSourceInfo *TSI, PropertyControl propControl = None);
785
+ static ObjCPropertyDecl *Create (ASTContext &C, DeclContext *DC,
786
+ SourceLocation L, const IdentifierInfo *Id,
787
+ SourceLocation AtLocation,
788
+ SourceLocation LParenLocation, QualType T,
789
+ TypeSourceInfo *TSI,
790
+ PropertyControl propControl = None);
789
791
790
792
static ObjCPropertyDecl *CreateDeserialized (ASTContext &C, unsigned ID);
791
793
@@ -952,7 +954,7 @@ class ObjCContainerDecl : public NamedDecl, public DeclContext {
952
954
void anchor () override ;
953
955
954
956
public:
955
- ObjCContainerDecl (Kind DK, DeclContext *DC, IdentifierInfo *Id,
957
+ ObjCContainerDecl (Kind DK, DeclContext *DC, const IdentifierInfo *Id,
956
958
SourceLocation nameLoc, SourceLocation atStartLoc);
957
959
958
960
// Iterator access to instance/class properties.
@@ -1240,7 +1242,7 @@ class ObjCInterfaceDecl : public ObjCContainerDecl
1240
1242
llvm::PointerIntPair<DefinitionData *, 1 , bool > Data;
1241
1243
1242
1244
ObjCInterfaceDecl (const ASTContext &C, DeclContext *DC, SourceLocation AtLoc,
1243
- IdentifierInfo *Id, ObjCTypeParamList *typeParamList,
1245
+ const IdentifierInfo *Id, ObjCTypeParamList *typeParamList,
1244
1246
SourceLocation CLoc, ObjCInterfaceDecl *PrevDecl,
1245
1247
bool IsInternal);
1246
1248
@@ -1271,13 +1273,11 @@ class ObjCInterfaceDecl : public ObjCContainerDecl
1271
1273
}
1272
1274
1273
1275
public:
1274
- static ObjCInterfaceDecl *Create (const ASTContext &C, DeclContext *DC,
1275
- SourceLocation atLoc,
1276
- IdentifierInfo *Id,
1277
- ObjCTypeParamList *typeParamList,
1278
- ObjCInterfaceDecl *PrevDecl,
1279
- SourceLocation ClassLoc = SourceLocation(),
1280
- bool isInternal = false);
1276
+ static ObjCInterfaceDecl *
1277
+ Create (const ASTContext &C, DeclContext *DC, SourceLocation atLoc,
1278
+ const IdentifierInfo *Id, ObjCTypeParamList *typeParamList,
1279
+ ObjCInterfaceDecl *PrevDecl,
1280
+ SourceLocation ClassLoc = SourceLocation(), bool isInternal = false);
1281
1281
1282
1282
static ObjCInterfaceDecl *CreateDeserialized (const ASTContext &C, unsigned ID);
1283
1283
@@ -1338,7 +1338,8 @@ class ObjCInterfaceDecl : public ObjCContainerDecl
1338
1338
ObjCImplementationDecl *getImplementation () const ;
1339
1339
void setImplementation (ObjCImplementationDecl *ImplD);
1340
1340
1341
- ObjCCategoryDecl *FindCategoryDeclaration (IdentifierInfo *CategoryId) const ;
1341
+ ObjCCategoryDecl *
1342
+ FindCategoryDeclaration (const IdentifierInfo *CategoryId) const ;
1342
1343
1343
1344
// Get the local instance/class method declared in a category.
1344
1345
ObjCMethodDecl *getCategoryInstanceMethod (Selector Sel) const ;
@@ -1794,9 +1795,9 @@ class ObjCInterfaceDecl : public ObjCContainerDecl
1794
1795
data ().CategoryList = category;
1795
1796
}
1796
1797
1797
- ObjCPropertyDecl
1798
- * FindPropertyVisibleInPrimaryClass (IdentifierInfo *PropertyId,
1799
- ObjCPropertyQueryKind QueryKind) const ;
1798
+ ObjCPropertyDecl *
1799
+ FindPropertyVisibleInPrimaryClass (const IdentifierInfo *PropertyId,
1800
+ ObjCPropertyQueryKind QueryKind) const ;
1800
1801
1801
1802
void collectPropertiesToImplement (PropertyMap &PM) const override ;
1802
1803
@@ -1954,8 +1955,8 @@ class ObjCIvarDecl : public FieldDecl {
1954
1955
1955
1956
private:
1956
1957
ObjCIvarDecl (ObjCContainerDecl *DC, SourceLocation StartLoc,
1957
- SourceLocation IdLoc, IdentifierInfo *Id,
1958
- QualType T, TypeSourceInfo *TInfo, AccessControl ac, Expr *BW,
1958
+ SourceLocation IdLoc, const IdentifierInfo *Id, QualType T ,
1959
+ TypeSourceInfo *TInfo, AccessControl ac, Expr *BW,
1959
1960
bool synthesized)
1960
1961
: FieldDecl(ObjCIvar, DC, StartLoc, IdLoc, Id, T, TInfo, BW,
1961
1962
/* Mutable=*/ false , /* HasInit=*/ ICIS_NoInit),
@@ -1964,10 +1965,9 @@ class ObjCIvarDecl : public FieldDecl {
1964
1965
public:
1965
1966
static ObjCIvarDecl *Create (ASTContext &C, ObjCContainerDecl *DC,
1966
1967
SourceLocation StartLoc, SourceLocation IdLoc,
1967
- IdentifierInfo *Id, QualType T,
1968
- TypeSourceInfo *TInfo,
1969
- AccessControl ac, Expr *BW = nullptr ,
1970
- bool synthesized=false );
1968
+ const IdentifierInfo *Id, QualType T,
1969
+ TypeSourceInfo *TInfo, AccessControl ac,
1970
+ Expr *BW = nullptr , bool synthesized = false );
1971
1971
1972
1972
static ObjCIvarDecl *CreateDeserialized (ASTContext &C, unsigned ID);
1973
1973
@@ -2343,7 +2343,7 @@ class ObjCCategoryDecl : public ObjCContainerDecl {
2343
2343
2344
2344
ObjCCategoryDecl (DeclContext *DC, SourceLocation AtLoc,
2345
2345
SourceLocation ClassNameLoc, SourceLocation CategoryNameLoc,
2346
- IdentifierInfo *Id, ObjCInterfaceDecl *IDecl,
2346
+ const IdentifierInfo *Id, ObjCInterfaceDecl *IDecl,
2347
2347
ObjCTypeParamList *typeParamList,
2348
2348
SourceLocation IvarLBraceLoc = SourceLocation(),
2349
2349
SourceLocation IvarRBraceLoc = SourceLocation());
@@ -2354,15 +2354,13 @@ class ObjCCategoryDecl : public ObjCContainerDecl {
2354
2354
friend class ASTDeclReader ;
2355
2355
friend class ASTDeclWriter ;
2356
2356
2357
- static ObjCCategoryDecl *Create (ASTContext &C, DeclContext *DC,
2358
- SourceLocation AtLoc,
2359
- SourceLocation ClassNameLoc,
2360
- SourceLocation CategoryNameLoc,
2361
- IdentifierInfo *Id,
2362
- ObjCInterfaceDecl *IDecl,
2363
- ObjCTypeParamList *typeParamList,
2364
- SourceLocation IvarLBraceLoc=SourceLocation(),
2365
- SourceLocation IvarRBraceLoc=SourceLocation());
2357
+ static ObjCCategoryDecl *
2358
+ Create (ASTContext &C, DeclContext *DC, SourceLocation AtLoc,
2359
+ SourceLocation ClassNameLoc, SourceLocation CategoryNameLoc,
2360
+ const IdentifierInfo *Id, ObjCInterfaceDecl *IDecl,
2361
+ ObjCTypeParamList *typeParamList,
2362
+ SourceLocation IvarLBraceLoc = SourceLocation(),
2363
+ SourceLocation IvarRBraceLoc = SourceLocation());
2366
2364
static ObjCCategoryDecl *CreateDeserialized (ASTContext &C, unsigned ID);
2367
2365
2368
2366
ObjCInterfaceDecl *getClassInterface () { return ClassInterface; }
@@ -2472,10 +2470,9 @@ class ObjCImplDecl : public ObjCContainerDecl {
2472
2470
void anchor () override ;
2473
2471
2474
2472
protected:
2475
- ObjCImplDecl (Kind DK, DeclContext *DC,
2476
- ObjCInterfaceDecl *classInterface,
2477
- IdentifierInfo *Id,
2478
- SourceLocation nameLoc, SourceLocation atStartLoc)
2473
+ ObjCImplDecl (Kind DK, DeclContext *DC, ObjCInterfaceDecl *classInterface,
2474
+ const IdentifierInfo *Id, SourceLocation nameLoc,
2475
+ SourceLocation atStartLoc)
2479
2476
: ObjCContainerDecl(DK, DC, Id, nameLoc, atStartLoc),
2480
2477
ClassInterface (classInterface) {}
2481
2478
@@ -2543,12 +2540,12 @@ class ObjCCategoryImplDecl : public ObjCImplDecl {
2543
2540
// Category name location
2544
2541
SourceLocation CategoryNameLoc;
2545
2542
2546
- ObjCCategoryImplDecl (DeclContext *DC, IdentifierInfo *Id,
2543
+ ObjCCategoryImplDecl (DeclContext *DC, const IdentifierInfo *Id,
2547
2544
ObjCInterfaceDecl *classInterface,
2548
2545
SourceLocation nameLoc, SourceLocation atStartLoc,
2549
2546
SourceLocation CategoryNameLoc)
2550
- : ObjCImplDecl(ObjCCategoryImpl, DC, classInterface, Id,
2551
- nameLoc, atStartLoc),
2547
+ : ObjCImplDecl(ObjCCategoryImpl, DC, classInterface, Id, nameLoc,
2548
+ atStartLoc),
2552
2549
CategoryNameLoc (CategoryNameLoc) {}
2553
2550
2554
2551
void anchor () override ;
@@ -2557,12 +2554,10 @@ class ObjCCategoryImplDecl : public ObjCImplDecl {
2557
2554
friend class ASTDeclReader ;
2558
2555
friend class ASTDeclWriter ;
2559
2556
2560
- static ObjCCategoryImplDecl *Create (ASTContext &C, DeclContext *DC,
2561
- IdentifierInfo *Id,
2562
- ObjCInterfaceDecl *classInterface,
2563
- SourceLocation nameLoc,
2564
- SourceLocation atStartLoc,
2565
- SourceLocation CategoryNameLoc);
2557
+ static ObjCCategoryImplDecl *
2558
+ Create (ASTContext &C, DeclContext *DC, const IdentifierInfo *Id,
2559
+ ObjCInterfaceDecl *classInterface, SourceLocation nameLoc,
2560
+ SourceLocation atStartLoc, SourceLocation CategoryNameLoc);
2566
2561
static ObjCCategoryImplDecl *CreateDeserialized (ASTContext &C, unsigned ID);
2567
2562
2568
2563
ObjCCategoryDecl *getCategoryDecl () const ;
0 commit comments