diff options
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 1 | ||||
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index d7b97b7ac2..10b307365c 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -2065,7 +2065,6 @@ isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index 84e03446f6..8b2d6f5e66 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -36,10 +36,11 @@ static void EmitDeclInit(CodeGenFunction &CGF, const VarDecl &D, if (!CGF.hasAggregateLLVMType(T)) { llvm::Value *V = CGF.EmitScalarExpr(Init); CodeGenModule &CGM = CGF.CGM; - if (CGF.getContext().getObjCGCAttrKind(T) == Qualifiers::Strong) + Qualifiers::GC GCAttr = CGM.getContext().getObjCGCAttrKind(T); + if (GCAttr == Qualifiers::Strong) CGM.getObjCRuntime().EmitObjCGlobalAssign(CGF, V, DeclPtr, D.isThreadSpecified()); - else if (CGF.getContext().getObjCGCAttrKind(T) == Qualifiers::Weak) + else if (GCAttr == Qualifiers::Weak) CGM.getObjCRuntime().EmitObjCWeakAssign(CGF, V, DeclPtr); else CGF.EmitStoreOfScalar(V, DeclPtr, isVolatile, Alignment, T); |