[llvm-branch-commits] [llvm-branch] r168378 - in /llvm/branches/release_32: ./ lib/Target/NVPTX/NVPTXISelLowering.cpp

[Pawel Wodnicki]

Author: pawel
Date: Tue Nov 20 13:25:29 2012
New Revision: 168378

URL: http://llvm.org/viewvc/llvm-project?rev=168378&view=rev
Log:
Merging r168001 into 3.2 release branch

NVPTXISelLowering.cpp: Fix warnings. [-Wunused-variable]

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Target/NVPTX/NVPTXISelLowering.cpp

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 20 13:25:29 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168189,168198,168316,168352
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168189,168198,168316,168352

Modified: llvm/branches/release_32/lib/Target/NVPTX/NVPTXISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Target/NVPTX/NVPTXISelLowering.cpp?rev=168378&r1=168377&r2=168378&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Target/NVPTX/NVPTXISelLowering.cpp (original)
+++ llvm/branches/release_32/lib/Target/NVPTX/NVPTXISelLowering.cpp Tue Nov 20 13:25:29 2012
@@ -874,10 +874,9 @@
   SDNode *Node = Op.getNode();
   LoadSDNode *LD = cast<LoadSDNode>(Node);
   DebugLoc dl = Node->getDebugLoc();
-  ISD::LoadExtType ExtType = LD->getExtensionType();
-  assert(ExtType == ISD::NON_EXTLOAD) ;
-  EVT VT = Node->getValueType(0);
-  assert(VT == MVT::i1 && "Custom lowering for i1 load only");
+  assert(LD->getExtensionType() == ISD::NON_EXTLOAD) ;
+  assert(Node->getValueType(0) == MVT::i1 &&
+         "Custom lowering for i1 load only");
   SDValue newLD = DAG.getLoad(MVT::i8, dl, LD->getChain(), LD->getBasePtr(),
                               LD->getPointerInfo(),
                               LD->isVolatile(), LD->isNonTemporal(),
@@ -903,8 +902,7 @@
   SDValue Tmp1 = ST->getChain();
   SDValue Tmp2 = ST->getBasePtr();
   SDValue Tmp3 = ST->getValue();
-  EVT VT = Tmp3.getValueType();
-  assert(VT == MVT::i1 && "Custom lowering for i1 store only");
+  assert(Tmp3.getValueType() == MVT::i1 && "Custom lowering for i1 store only");
   unsigned Alignment = ST->getAlignment();
   bool isVolatile = ST->isVolatile();
   bool isNonTemporal = ST->isNonTemporal();