maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

IR: Declare LookupKey right before its use, NFC 

llvm-svn: 215956
This commit is contained in:
Duncan P. N. Exon Smith 2014-08-19 00:24:26 +00:00
parent 1cd4aebefe
commit 3fa26b7661
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/IR/Constants.cpp
View File

@ -2660,8 +2660,6 @@ void ConstantArray::replaceUsesOfWithOnConstant(Value *From, Value *To,
LLVMContextImpl *pImpl = getType()->getContext().pImpl; LLVMContextImpl *pImpl = getType()->getContext().pImpl;
SmallVector<Constant*, 8> Values; SmallVector<Constant*, 8> Values;
LLVMContextImpl::ArrayConstantsTy::LookupKey Lookup;
Lookup.first = cast<ArrayType>(getType());
Values.reserve(getNumOperands()); // Build replacement array. Values.reserve(getNumOperands()); // Build replacement array.
// Fill values with the modified operands of the constant array. Also, // Fill values with the modified operands of the constant array. Also,
@ -2687,7 +2685,8 @@ void ConstantArray::replaceUsesOfWithOnConstant(Value *From, Value *To,
Replacement = UndefValue::get(getType()); Replacement = UndefValue::get(getType());
} else { } else {
// Check to see if we have this array type already. // Check to see if we have this array type already.
Lookup.second = makeArrayRef(Values); LLVMContextImpl::ArrayConstantsTy::LookupKey Lookup(
cast<ArrayType>(getType()), makeArrayRef(Values));
LLVMContextImpl::ArrayConstantsTy::MapTy::iterator I = LLVMContextImpl::ArrayConstantsTy::MapTy::iterator I =
pImpl->ArrayConstants.find(Lookup); pImpl->ArrayConstants.find(Lookup);
@ -2736,8 +2735,6 @@ void ConstantStruct::replaceUsesOfWithOnConstant(Value *From, Value *To,
assert(getOperand(OperandToUpdate) == From && "ReplaceAllUsesWith broken!"); assert(getOperand(OperandToUpdate) == From && "ReplaceAllUsesWith broken!");
SmallVector<Constant*, 8> Values; SmallVector<Constant*, 8> Values;
LLVMContextImpl::StructConstantsTy::LookupKey Lookup;
Lookup.first = cast<StructType>(getType());
Values.reserve(getNumOperands()); // Build replacement struct. Values.reserve(getNumOperands()); // Build replacement struct.
// Fill values with the modified operands of the constant struct. Also, // Fill values with the modified operands of the constant struct. Also,
@ -2773,7 +2770,8 @@ void ConstantStruct::replaceUsesOfWithOnConstant(Value *From, Value *To,
Replacement = UndefValue::get(getType()); Replacement = UndefValue::get(getType());
} else { } else {
// Check to see if we have this struct type already. // Check to see if we have this struct type already.
Lookup.second = makeArrayRef(Values); LLVMContextImpl::StructConstantsTy::LookupKey Lookup(
cast<StructType>(getType()), makeArrayRef(Values));
LLVMContextImpl::StructConstantsTy::MapTy::iterator I = LLVMContextImpl::StructConstantsTy::MapTy::iterator I =
pImpl->StructConstants.find(Lookup); pImpl->StructConstants.find(Lookup);