[llvm] r293039 - Fix buildbot failures introduced by 293036

[Artur Pilipenko via llvm-commits]

Author: apilipenko
Date: Wed Jan 25 03:10:07 2017
New Revision: 293039

URL: http://llvm.org/viewvc/llvm-project?rev=293039&view=rev
Log:
Fix buildbot failures introduced by 293036

Fix unused variable, specify types explicitly to make VC compiler happy.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=293039&r1=293038&r2=293039&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Jan 25 03:10:07 2017
@@ -4416,6 +4416,7 @@ const Optional<ByteProvider> calculateBy
     return None;
   unsigned ByteWidth = BitWidth / 8;
   assert(Index < ByteWidth && "invalid index requested");
+  (void) ByteWidth;
 
   switch (Op.getOpcode()) {
   case ISD::OR: {
@@ -4522,8 +4523,10 @@ SDValue DAGCombiner::MatchLoadCombine(SD
   if (LegalOperations && !TLI.isOperationLegal(ISD::LOAD, VT))
     return SDValue();
 
-  auto LittleEndianByteAt = [](unsigned BW, unsigned i) { return i; };
-  auto BigEndianByteAt = [](unsigned BW, unsigned i) { return BW - i - 1; };
+  std::function<unsigned(unsigned, unsigned)> LittleEndianByteAt = [](
+    unsigned BW, unsigned i) { return i; };
+  std::function<unsigned(unsigned, unsigned)> BigEndianByteAt = [](
+    unsigned BW, unsigned i) { return BW - i - 1; };
 
   Optional<BaseIndexOffset> Base;
   SDValue Chain;