Revert "expand-fp: Move "Modified" check"

This reverts commit 0ea427f.

Author: frederik-h

llvm/lib/CodeGen/ExpandFp.cpp

@@ -941,9 +941,10 @@ static void scalarize(Instruction *I,
       llvm_unreachable("Unsupported instruction type");
 
     Result = Builder.CreateInsertElement(Result, NewOp, Idx);
-    Instruction *ScalarizedI = cast<Instruction>(NewOp);
-    ScalarizedI->copyIRFlags(I, true);
-    Worklist.push_back(ScalarizedI);
+    if (auto *ScalarizedI = dyn_cast<Instruction>(NewOp)) {
+      ScalarizedI->copyIRFlags(I, true);
+      Worklist.push_back(ScalarizedI);
+    }
   }
 
   I->replaceAllUsesWith(Result);
@@ -992,6 +993,7 @@ static void addToWorklist(Instruction &I,
 static bool runImpl(Function &F, const TargetLowering &TLI,
                     AssumptionCache *AC) {
   SmallVector<Instruction *, 4> Worklist;
+  bool Modified = false;
 
   unsigned MaxLegalFpConvertBitWidth =
       TLI.getMaxLargeFPConvertBitWidthSupported();
@@ -1013,6 +1015,7 @@ static bool runImpl(Function &F, const TargetLowering &TLI,
       if (!targetSupportsFrem(TLI, Ty) &&
           FRemExpander::canExpandType(Ty->getScalarType())) {
         addToWorklist(I, Worklist);
+        Modified = true;
       }
       break;
     case Instruction::FPToUI:
@@ -1022,6 +1025,7 @@ static bool runImpl(Function &F, const TargetLowering &TLI,
         continue;
 
       addToWorklist(I, Worklist);
+      Modified = true;
       break;
     }
     case Instruction::UIToFP:
@@ -1032,14 +1036,14 @@ static bool runImpl(Function &F, const TargetLowering &TLI,
         continue;
 
       addToWorklist(I, Worklist);
+      Modified = true;
       break;
     }
     default:
       break;
     }
   }
 
-  bool Modified = !Worklist.empty();
   while (!Worklist.empty()) {
     Instruction *I = Worklist.pop_back_val();
     if (I->getOpcode() == Instruction::FRem) {