- Minor cleanup to yesterday's changes to Sema::ObjcActOnStartOfMethodDef();
- Add Sema::CurMethodDecl, in preparation for adding ObjcIvarRefExpr.
- Add ObjcInterfaceDecl::lookupInstanceVariable(), in prep for adding ivars.
- A couple renames in ObjcInterfaceDecl, while I was in the vicinity:-)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44015 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp
index a0a1147..66f8aa8 100644
--- a/Driver/RewriteTest.cpp
+++ b/Driver/RewriteTest.cpp
@@ -981,7 +981,7 @@
SynthesizeObjcInternalStruct(RCDecl, Result);
}
- int NumIvars = CDecl->getIntfDeclNumIvars();
+ int NumIvars = CDecl->getNumInstanceVariables();
// If no ivars and no root or if its root, directly or indirectly,
// have no ivars (thus not synthesized) then no need to synthesize this class.
if (NumIvars <= 0 && (!RCDecl || !ObjcSynthesizedStructs.count(RCDecl)))
@@ -1391,7 +1391,7 @@
// Build _objc_ivar_list metadata for classes ivars if needed
int NumIvars = IDecl->getImplDeclNumIvars() > 0
? IDecl->getImplDeclNumIvars()
- : (CDecl ? CDecl->getIntfDeclNumIvars() : 0);
+ : (CDecl ? CDecl->getNumInstanceVariables() : 0);
SynthesizeObjcInternalStruct(CDecl, Result);
@@ -1430,7 +1430,7 @@
ObjcIvarDecl **Ivars = IDecl->getImplDeclIVars()
? IDecl->getImplDeclIVars()
- : CDecl->getIntfDeclIvars();
+ : CDecl->getInstanceVariables();
Result += "\t,{{\"";
Result += Ivars[0]->getName();
Result += "\", \"";