Miscellanous fixes in generatation of objc gc's write-barriers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82472 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGValue.h b/lib/CodeGen/CGValue.h
index af034a7..d9dd94d 100644
--- a/lib/CodeGen/CGValue.h
+++ b/lib/CodeGen/CGValue.h
@@ -154,7 +154,7 @@
bool Ivar:1;
// objective-c's ivar is an array
- bool IvarArray:1;
+ bool ObjIsArray:1;
// LValue is non-gc'able for any reason, including being a parameter or local
// variable.
@@ -176,7 +176,7 @@
// FIXME: Convenient place to set objc flags to 0. This should really be
// done in a user-defined constructor instead.
R.ObjCType = None;
- R.Ivar = R.IvarArray = R.NonGC = R.GlobalObjCRef = false;
+ R.Ivar = R.ObjIsArray = R.NonGC = R.GlobalObjCRef = false;
}
public:
@@ -195,7 +195,7 @@
}
bool isObjCIvar() const { return Ivar; }
- bool isObjCIvarArray() const { return IvarArray; }
+ bool isObjCArray() const { return ObjIsArray; }
bool isNonGC () const { return NonGC; }
bool isGlobalObjCRef() const { return GlobalObjCRef; }
bool isObjCWeak() const { return ObjCType == Weak; }
@@ -206,8 +206,8 @@
static void SetObjCIvar(LValue& R, bool iValue) {
R.Ivar = iValue;
}
- static void SetObjCIvarArray(LValue& R, bool iValue) {
- R.IvarArray = iValue;
+ static void SetObjCArray(LValue& R, bool iValue) {
+ R.ObjIsArray = iValue;
}
static void SetGlobalObjCRef(LValue& R, bool iValue) {
R.GlobalObjCRef = iValue;