Rename variables to avoid conflict.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68764 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index c5f2202..a3fca20 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -482,7 +482,7 @@
assert(0 && "Constant expressions should be initialized.");
return 0;
case APValue::LValue: {
- const llvm::Type *DestType = getTypes().ConvertTypeForMem(E->getType());
+ const llvm::Type *DestTy = getTypes().ConvertTypeForMem(E->getType());
llvm::Constant *Offset =
llvm::ConstantInt::get(llvm::Type::Int64Ty,
Result.Val.getLValueOffset());
@@ -502,21 +502,21 @@
// Convert to the appropriate type; this could be an lvalue for
// an integer.
- if (isa<llvm::PointerType>(DestType))
- return llvm::ConstantExpr::getBitCast(C, DestType);
+ if (isa<llvm::PointerType>(DestTy))
+ return llvm::ConstantExpr::getBitCast(C, DestTy);
- return llvm::ConstantExpr::getPtrToInt(C, DestType);
+ return llvm::ConstantExpr::getPtrToInt(C, DestTy);
} else {
C = Offset;
// Convert to the appropriate type; this could be an lvalue for
// an integer.
- if (isa<llvm::PointerType>(DestType))
- return llvm::ConstantExpr::getIntToPtr(C, DestType);
+ if (isa<llvm::PointerType>(DestTy))
+ return llvm::ConstantExpr::getIntToPtr(C, DestTy);
// If the types don't match this should only be a truncate.
- if (C->getType() != DestType)
- return llvm::ConstantExpr::getTrunc(C, DestType);
+ if (C->getType() != DestTy)
+ return llvm::ConstantExpr::getTrunc(C, DestTy);
return C;
}