[llvm] r215956 - IR: Declare LookupKey right before its use, NFC

Duncan P. N. Exon Smith dexonsmith at apple.com
Mon Aug 18 17:24:26 PDT 2014


Author: dexonsmith
Date: Mon Aug 18 19:24:26 2014
New Revision: 215956

URL: http://llvm.org/viewvc/llvm-project?rev=215956&view=rev
Log:
IR: Declare LookupKey right before its use, NFC

Modified:
    llvm/trunk/lib/IR/Constants.cpp

Modified: llvm/trunk/lib/IR/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Constants.cpp?rev=215956&r1=215955&r2=215956&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Constants.cpp (original)
+++ llvm/trunk/lib/IR/Constants.cpp Mon Aug 18 19:24:26 2014
@@ -2660,8 +2660,6 @@ void ConstantArray::replaceUsesOfWithOnC
   LLVMContextImpl *pImpl = getType()->getContext().pImpl;
 
   SmallVector<Constant*, 8> Values;
-  LLVMContextImpl::ArrayConstantsTy::LookupKey Lookup;
-  Lookup.first = cast<ArrayType>(getType());
   Values.reserve(getNumOperands());  // Build replacement array.
 
   // Fill values with the modified operands of the constant array.  Also,
@@ -2687,7 +2685,8 @@ void ConstantArray::replaceUsesOfWithOnC
     Replacement = UndefValue::get(getType());
   } else {
     // 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 =
       pImpl->ArrayConstants.find(Lookup);
 
@@ -2736,8 +2735,6 @@ void ConstantStruct::replaceUsesOfWithOn
   assert(getOperand(OperandToUpdate) == From && "ReplaceAllUsesWith broken!");
 
   SmallVector<Constant*, 8> Values;
-  LLVMContextImpl::StructConstantsTy::LookupKey Lookup;
-  Lookup.first = cast<StructType>(getType());
   Values.reserve(getNumOperands());  // Build replacement struct.
 
   // Fill values with the modified operands of the constant struct.  Also,
@@ -2773,7 +2770,8 @@ void ConstantStruct::replaceUsesOfWithOn
     Replacement = UndefValue::get(getType());
   } else {
     // 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 =
       pImpl->StructConstants.find(Lookup);
 





More information about the llvm-commits mailing list