[llvm-branch-commits] [llvm-branch] r214310 - Merging r213793:

[Justin Holewinski]

Author: jholewinski
Date: Wed Jul 30 09:53:00 2014
New Revision: 214310

URL: http://llvm.org/viewvc/llvm-project?rev=214310&view=rev
Log:
Merging r213793:
------------------------------------------------------------------------
r213793 | jholewinski | 2014-07-23 16:23:47 -0400 (Wed, 23 Jul 2014) | 4 lines

[NVPTX] Silence a GCC warning found by the buildbots

The cast to NVPTXTargetLowering was missing a 'const', but let's
just access the right pointer through the subtarget anyway.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 30 09:53:00 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213773,213815,213847,213880,213884,213894-213895,213915,214129,214180,214287
+/llvm/trunk:155241,213653,213749,213773,213793,213815,213847,213880,213884,213894-213895,213915,214129,214180,214287

Modified: llvm/branches/release_35/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp?rev=214310&r1=214309&r2=214310&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp (original)
+++ llvm/branches/release_35/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp Wed Jul 30 09:53:00 2014
@@ -98,7 +98,7 @@ bool NVPTXDAGToDAGISel::useF32FTZ() cons
 }
 
 bool NVPTXDAGToDAGISel::allowFMA() const {
-  const NVPTXTargetLowering *TL = (NVPTXTargetLowering *)getTargetLowering();
+  const NVPTXTargetLowering *TL = Subtarget.getTargetLowering();
   return TL->allowFMA(*MF, OptLevel);
 }