Index: llvm/lib/Transforms/Utils/SCCPSolver.cpp
===================================================================
--- llvm/lib/Transforms/Utils/SCCPSolver.cpp
+++ llvm/lib/Transforms/Utils/SCCPSolver.cpp
@@ -270,6 +270,8 @@
   void handleCallOverdefined(CallBase &CB);
   void handleCallResult(CallBase &CB);
   void handleCallArguments(CallBase &CB);
+  void handleExtractOfWithOverflow(ExtractValueInst &EVI,
+                                   const WithOverflowInst *WO, unsigned Idx);
 
 private:
   friend class InstVisitor<SCCPInstVisitor>;
@@ -860,6 +862,33 @@
     markOverdefined(&I);
 }
 
+void SCCPInstVisitor::handleExtractOfWithOverflow(ExtractValueInst &EVI,
+                                                  const WithOverflowInst *WO,
+                                                  unsigned Idx) {
+  Value *LHS = WO->getLHS(), *RHS = WO->getRHS();
+  ValueLatticeElement L = getValueState(LHS);
+  ValueLatticeElement R = getValueState(RHS);
+  addAdditionalUser(LHS, &EVI);
+  addAdditionalUser(RHS, &EVI);
+  if (L.isUnknownOrUndef() || R.isUnknownOrUndef())
+    return; // Wait to resolve.
+
+  Type *Ty = LHS->getType();
+  ConstantRange LR = getConstantRange(L, Ty);
+  ConstantRange RR = getConstantRange(R, Ty);
+  if (Idx == 0) {
+    ConstantRange Res = LR.binaryOp(WO->getBinaryOp(), RR);
+    mergeInValue(&EVI, ValueLatticeElement::getRange(Res));
+  } else {
+    assert(Idx == 1 && "Index can only be 0 or 1");
+    ConstantRange NWRegion = ConstantRange::makeGuaranteedNoWrapRegion(
+        WO->getBinaryOp(), RR, WO->getNoWrapKind());
+    if (NWRegion.contains(LR))
+      return (void)markConstant(&EVI, ConstantInt::getFalse(EVI.getType()));
+    markOverdefined(&EVI);
+  }
+}
+
 void SCCPInstVisitor::visitExtractValueInst(ExtractValueInst &EVI) {
   // If this returns a struct, mark all elements over defined, we don't track
   // structs in structs.
@@ -878,6 +907,8 @@
   Value *AggVal = EVI.getAggregateOperand();
   if (AggVal->getType()->isStructTy()) {
     unsigned i = *EVI.idx_begin();
+    if (auto *WO = dyn_cast<WithOverflowInst>(AggVal))
+      return handleExtractOfWithOverflow(EVI, WO, i);
     ValueLatticeElement EltVal = getStructValueState(AggVal, i);
     mergeInValue(getValueState(&EVI), &EVI, EltVal);
   } else {
Index: llvm/test/Transforms/SCCP/with.overflow.ll
===================================================================
--- llvm/test/Transforms/SCCP/with.overflow.ll
+++ llvm/test/Transforms/SCCP/with.overflow.ll
@@ -20,20 +20,17 @@
 ; CHECK-NEXT:    [[V1_2:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG5:![0-9]+]]
 ; CHECK-NEXT:    [[V1_3:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG6:![0-9]+]]
 ; CHECK-NEXT:    [[WO1:%.*]] = call { i8, i1 } @llvm.uadd.with.overflow.i8(i8 [[V0_100]], i8 [[V0_155]])
-; CHECK-NEXT:    [[OV1:%.*]] = extractvalue { i8, i1 } [[WO1]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV1]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO2:%.*]] = call { i8, i1 } @llvm.uadd.with.overflow.i8(i8 [[V0_100]], i8 [[V0_156]])
 ; CHECK-NEXT:    [[OV2:%.*]] = extractvalue { i8, i1 } [[WO2]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV2]])
 ; CHECK-NEXT:    [[WO3:%.*]] = call { i8, i1 } @llvm.usub.with.overflow.i8(i8 [[V100_255]], i8 [[V0_100]])
-; CHECK-NEXT:    [[OV3:%.*]] = extractvalue { i8, i1 } [[WO3]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV3]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO4:%.*]] = call { i8, i1 } @llvm.usub.with.overflow.i8(i8 [[V99_255]], i8 [[V0_100]])
 ; CHECK-NEXT:    [[OV4:%.*]] = extractvalue { i8, i1 } [[WO4]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV4]])
 ; CHECK-NEXT:    [[WO5:%.*]] = call { i8, i1 } @llvm.umul.with.overflow.i8(i8 [[V0_100]], i8 [[V1_2]])
-; CHECK-NEXT:    [[OV5:%.*]] = extractvalue { i8, i1 } [[WO5]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV5]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO6:%.*]] = call { i8, i1 } @llvm.umul.with.overflow.i8(i8 [[V0_100]], i8 [[V1_3]])
 ; CHECK-NEXT:    [[OV6:%.*]] = extractvalue { i8, i1 } [[WO6]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV6]])
@@ -83,20 +80,17 @@
 ; CHECK-NEXT:    [[V1_4:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG11:![0-9]+]]
 ; CHECK-NEXT:    [[V1_5:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG12:![0-9]+]]
 ; CHECK-NEXT:    [[WO1:%.*]] = call { i8, i1 } @llvm.sadd.with.overflow.i8(i8 [[V0_100]], i8 [[V0_27]])
-; CHECK-NEXT:    [[OV1:%.*]] = extractvalue { i8, i1 } [[WO1]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV1]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO2:%.*]] = call { i8, i1 } @llvm.sadd.with.overflow.i8(i8 [[V0_100]], i8 [[V0_28]])
 ; CHECK-NEXT:    [[OV2:%.*]] = extractvalue { i8, i1 } [[WO2]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV2]])
 ; CHECK-NEXT:    [[WO3:%.*]] = call { i8, i1 } @llvm.ssub.with.overflow.i8(i8 [[V0_100]], i8 [[VM27_0]])
-; CHECK-NEXT:    [[OV3:%.*]] = extractvalue { i8, i1 } [[WO3]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV3]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO4:%.*]] = call { i8, i1 } @llvm.ssub.with.overflow.i8(i8 [[V0_100]], i8 [[VM28_0]])
 ; CHECK-NEXT:    [[OV4:%.*]] = extractvalue { i8, i1 } [[WO4]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV4]])
 ; CHECK-NEXT:    [[WO5:%.*]] = call { i8, i1 } @llvm.smul.with.overflow.i8(i8 [[V0_27]], i8 [[V1_4]])
-; CHECK-NEXT:    [[OV5:%.*]] = extractvalue { i8, i1 } [[WO5]], 1
-; CHECK-NEXT:    call void @use.i1(i1 [[OV5]])
+; CHECK-NEXT:    call void @use.i1(i1 false)
 ; CHECK-NEXT:    [[WO6:%.*]] = call { i8, i1 } @llvm.smul.with.overflow.i8(i8 [[V0_27]], i8 [[V1_5]])
 ; CHECK-NEXT:    [[OV6:%.*]] = extractvalue { i8, i1 } [[WO6]], 1
 ; CHECK-NEXT:    call void @use.i1(i1 [[OV6]])
@@ -144,30 +138,24 @@
 ; CHECK-NEXT:    [[V2_3:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG16:![0-9]+]]
 ; CHECK-NEXT:    [[WO1:%.*]] = call { i8, i1 } @llvm.uadd.with.overflow.i8(i8 [[V0_20]], i8 [[V20_40]])
 ; CHECK-NEXT:    [[RES1:%.*]] = extractvalue { i8, i1 } [[WO1]], 0
-; CHECK-NEXT:    [[CMP1_1:%.*]] = icmp uge i8 [[RES1]], 20
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_1]])
-; CHECK-NEXT:    [[CMP1_2:%.*]] = icmp ule i8 [[RES1]], 60
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP1_3:%.*]] = icmp ugt i8 [[RES1]], 20
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_3]])
 ; CHECK-NEXT:    [[CMP1_4:%.*]] = icmp ult i8 [[RES1]], 60
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_4]])
 ; CHECK-NEXT:    [[WO2:%.*]] = call { i8, i1 } @llvm.usub.with.overflow.i8(i8 [[V0_10]], i8 [[V20_40]])
 ; CHECK-NEXT:    [[RES2:%.*]] = extractvalue { i8, i1 } [[WO2]], 0
-; CHECK-NEXT:    [[CMP2_1:%.*]] = icmp uge i8 [[RES2]], -40
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_1]])
-; CHECK-NEXT:    [[CMP2_2:%.*]] = icmp ule i8 [[RES2]], -10
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP2_3:%.*]] = icmp ugt i8 [[RES2]], -40
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_3]])
 ; CHECK-NEXT:    [[CMP2_4:%.*]] = icmp ult i8 [[RES2]], -10
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_4]])
 ; CHECK-NEXT:    [[WO3:%.*]] = call { i8, i1 } @llvm.umul.with.overflow.i8(i8 [[V20_40]], i8 [[V2_3]])
 ; CHECK-NEXT:    [[RES3:%.*]] = extractvalue { i8, i1 } [[WO3]], 0
-; CHECK-NEXT:    [[CMP3_1:%.*]] = icmp uge i8 [[RES3]], 40
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_1]])
-; CHECK-NEXT:    [[CMP3_2:%.*]] = icmp ule i8 [[RES3]], 120
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP3_3:%.*]] = icmp ugt i8 [[RES3]], 40
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_3]])
 ; CHECK-NEXT:    [[CMP3_4:%.*]] = icmp ult i8 [[RES3]], 120
@@ -222,30 +210,24 @@
 ; CHECK-NEXT:    [[V2_3:%.*]] = load i8, ptr [[P]], align 1, !range [[RNG16]]
 ; CHECK-NEXT:    [[WO1:%.*]] = call { i8, i1 } @llvm.sadd.with.overflow.i8(i8 [[V0_20]], i8 [[V20_40]])
 ; CHECK-NEXT:    [[RES1:%.*]] = extractvalue { i8, i1 } [[WO1]], 0
-; CHECK-NEXT:    [[CMP1_1:%.*]] = icmp uge i8 [[RES1]], 20
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_1]])
-; CHECK-NEXT:    [[CMP1_2:%.*]] = icmp ule i8 [[RES1]], 60
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP1_3:%.*]] = icmp ugt i8 [[RES1]], 20
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_3]])
 ; CHECK-NEXT:    [[CMP1_4:%.*]] = icmp ult i8 [[RES1]], 60
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP1_4]])
 ; CHECK-NEXT:    [[WO2:%.*]] = call { i8, i1 } @llvm.ssub.with.overflow.i8(i8 [[V0_10]], i8 [[V20_40]])
 ; CHECK-NEXT:    [[RES2:%.*]] = extractvalue { i8, i1 } [[WO2]], 0
-; CHECK-NEXT:    [[CMP2_1:%.*]] = icmp uge i8 [[RES2]], -40
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_1]])
-; CHECK-NEXT:    [[CMP2_2:%.*]] = icmp ule i8 [[RES2]], -10
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP2_3:%.*]] = icmp ugt i8 [[RES2]], -40
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_3]])
 ; CHECK-NEXT:    [[CMP2_4:%.*]] = icmp ult i8 [[RES2]], -10
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP2_4]])
 ; CHECK-NEXT:    [[WO3:%.*]] = call { i8, i1 } @llvm.smul.with.overflow.i8(i8 [[V20_40]], i8 [[V2_3]])
 ; CHECK-NEXT:    [[RES3:%.*]] = extractvalue { i8, i1 } [[WO3]], 0
-; CHECK-NEXT:    [[CMP3_1:%.*]] = icmp uge i8 [[RES3]], 40
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_1]])
-; CHECK-NEXT:    [[CMP3_2:%.*]] = icmp ule i8 [[RES3]], 120
-; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_2]])
+; CHECK-NEXT:    call void @use.i1(i1 true)
+; CHECK-NEXT:    call void @use.i1(i1 true)
 ; CHECK-NEXT:    [[CMP3_3:%.*]] = icmp ugt i8 [[RES3]], 40
 ; CHECK-NEXT:    call void @use.i1(i1 [[CMP3_3]])
 ; CHECK-NEXT:    [[CMP3_4:%.*]] = icmp ult i8 [[RES3]], 120