Remove getValueOr - move it inline

Author: davemgreen

llvm/include/llvm/Support/InstructionCost.h

@@ -87,11 +87,6 @@ class InstructionCost {
     assert(isValid());
     return Value;
   }
-  CostType getValueOr(CostType Alt) const {
-    if (!isValid())
-      return Alt;
-    return Value;
-  }
 
   /// For all of the arithmetic operators provided here any invalid state is
   /// perpetuated and cannot be removed. Once a cost becomes invalid it stays

llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp

@@ -205,7 +205,8 @@ static CostType calculateFunctionCosts(GetTTIFn GetTTI, Module &M,
             TTI.getInstructionCost(&I, TargetTransformInfo::TCK_CodeSize);
         assert(Cost != InstructionCost::getMax());
         // Assume expensive if we can't tell the cost of an instruction.
-        CostType CostVal = Cost.getValueOr(TargetTransformInfo::TCC_Expensive);
+        CostType CostVal = Cost.isValid() ? Cost.getValue()
+                                          : TargetTransformInfo::TCC_Expensive;
         assert((FnCost + CostVal) >= FnCost && "Overflow!");
         FnCost += CostVal;
       }

llvm/unittests/Support/InstructionCostTest.cpp

@@ -71,7 +71,6 @@ TEST_F(CostTest, Operators) {
 
   // Test value extraction
   EXPECT_EQ(VThree.getValue(), 3);
-  EXPECT_EQ(IThreeA.getValueOr(10), 10);
 
   EXPECT_EQ(std::min(VThree, VNegTwo), -2);
   EXPECT_EQ(std::max(VThree, VSix), 6);