Merge commit 'c37a8acef642' from llvm.org/master into apple/main

Author: git apple-llvm automerger

llvm/include/llvm/Analysis/TargetTransformInfoImpl.h

@@ -859,11 +859,6 @@ class TargetTransformInfoImplCRTPBase : public TargetTransformInfoImplBase {
     case Instruction::Call: {
       assert(isa<IntrinsicInst>(U) && "Unexpected non-intrinsic call");
       auto *Intrinsic = cast<IntrinsicInst>(U);
-      // FIXME: We shouldn't have this exception for RecipThroughput.
-      if (CostKind == TTI::TCK_RecipThroughput) {
-        IntrinsicCostAttributes CostAttrs(*Intrinsic);
-        return TargetTTI->getIntrinsicInstrCost(CostAttrs, CostKind);
-      }
       IntrinsicCostAttributes CostAttrs(Intrinsic->getIntrinsicID(), *CB);
       return TargetTTI->getIntrinsicInstrCost(CostAttrs, CostKind);
     }