minor name changes, no functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64972 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 6c72a76a60d4358ef99d81d8b8ad8385dd42b4e7..53363c15eca49f096e3f4ba6c1ef74e460be1c70 100644 (file)
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -1053,13 +1053,13 @@ void ComplexType::getAsStringInternal(std::string &S) const {
 }
 
 void ExtQualType::getAsStringInternal(std::string &S) const {
-  bool space = false;
+  bool NeedsSpace = false;
   if (AddressSpace) {
     S = "__attribute__((address_space("+llvm::utostr_32(AddressSpace)+")))" + S;
-    space = true;
+    NeedsSpace = true;
   }
   if (GCAttrType != QualType::GCNone) {
-    if (space)
+    if (NeedsSpace)
       S += ' ';
     S += "__attribute__((objc_gc(";
     if (GCAttrType == QualType::Weak)

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index dfd024b31e666f1d80cc8506396bfe490f1d425a..f0e6c81fdc121f8c9ec1213bc5a932ef2a49f25c 100644 (file)
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -778,7 +778,7 @@ static void HandleAddressSpaceTypeAttribute(QualType &Type,
 /// HandleObjCGCTypeAttribute - Process an objc's gc attribute on the
 /// specified type.  The attribute contains 1 argument, weak or strong.
 static void HandleObjCGCTypeAttribute(QualType &Type, 
-                                      const AttributeList &Attr, Sema &S){
+                                      const AttributeList &Attr, Sema &S) {
   // FIXME. change error code.
   if (Type.getObjCGCAttr() != QualType::GCNone) {
     S.Diag(Attr.getLoc(), diag::err_attribute_multiple_objc_gc);
@@ -791,22 +791,22 @@ static void HandleObjCGCTypeAttribute(QualType &Type,
       << "objc_gc" << 1;
     return;
   }
-  QualType::GCAttrTypes attr;
+  QualType::GCAttrTypes GCAttr;
   if (Attr.getNumArgs() != 0) {
     S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
     return;
   }
   if (Attr.getParameterName()->isStr("weak")) 
-    attr = QualType::Weak;
+    GCAttr = QualType::Weak;
   else if (Attr.getParameterName()->isStr("strong"))
-    attr = QualType::Strong;
+    GCAttr = QualType::Strong;
   else {
     S.Diag(Attr.getLoc(), diag::warn_attribute_type_not_supported)
       << "objc_gc" << Attr.getParameterName();
     return;
   }
   
-  Type = S.Context.getObjCGCQualType(Type, attr);
+  Type = S.Context.getObjCGCQualType(Type, GCAttr);
 }
 
 void Sema::ProcessTypeAttributeList(QualType &Result, const AttributeList *AL) {