[llvm] r313302 - Fix warnings in r313297.

[Jan Sjodin via llvm-commits]

Author: jsjodin
Date: Thu Sep 14 14:49:52 2017
New Revision: 313302

URL: http://llvm.org/viewvc/llvm-project?rev=313302&view=rev
Log:
Fix warnings in r313297.


Modified:
    llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp
    llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.h

Modified: llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp?rev=313302&r1=313301&r2=313302&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp Thu Sep 14 14:49:52 2017
@@ -1886,12 +1886,10 @@ unsigned SIInstrInfo::getAddressSpaceFor
   case PseudoSourceValue::ExternalSymbolCallEntry:
   case PseudoSourceValue::TargetCustom:
     return AMDGPUASI.CONSTANT_ADDRESS;
-  default:
-      return AMDGPUASI.FLAT_ADDRESS;
   }
+  return AMDGPUASI.FLAT_ADDRESS;
 }
 
-
 static void removeModOperands(MachineInstr &MI) {
   unsigned Opc = MI.getOpcode();
   int Src0ModIdx = AMDGPU::getNamedOperandIdx(Opc,

Modified: llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.h?rev=313302&r1=313301&r2=313302&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.h Thu Sep 14 14:49:52 2017
@@ -259,8 +259,8 @@ public:
                           unsigned DstReg, ArrayRef<MachineOperand> Cond,
                           unsigned TrueReg, unsigned FalseReg) const;
 
-  unsigned
-    getAddressSpaceForPseudoSourceKind(PseudoSourceValue::PSVKind Kind) const;
+  unsigned getAddressSpaceForPseudoSourceKind(
+             PseudoSourceValue::PSVKind Kind) const override;
 
   bool
   areMemAccessesTriviallyDisjoint(MachineInstr &MIa, MachineInstr &MIb,