Fix skipping deleted instructions before replacing operands.

Fixes hitting a (benign) assert in replaceSource(). Change-Id: I7f984d484133e619717d004f20cd671a54473185 Reviewed-on: https://chromium-review.googlesource.com/414490Reviewed-by: Jim Stichnoth <stichnot@chromium.org>

Fix skipping deleted instructions before replacing operands.
e1e17832 · Nicolas Capens · Nicolas Capens · 8be69751 · e1e17832
Commit e1e17832 authored Nov 24, 2016 by Nicolas Capens Committed by Nicolas Capens Nov 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

IceCfg.cpp src/IceCfg.cpp +8 -6

No files found.
--- a/src/IceCfg.cpp
+++ b/src/IceCfg.cpp
@@ -853,15 +853,17 @@ void Cfg::floatConstantCSE() {
        // Block should not end with a call
      }
      while (Current != End && !llvm::isa<InstCall>(iteratorToInst(Current))) {
-        for (SizeT i = 0; i < Current->getSrcSize(); ++i) {
+        if (!Current->isDeleted()) {
-          if (auto *Const = llvm::dyn_cast<Constant>(Current->getSrc(i))) {
+          for (SizeT i = 0; i < Current->getSrcSize(); ++i) {
-            if (Const->getType() == IceType_f32 ||
+            if (auto *Const = llvm::dyn_cast<Constant>(Current->getSrc(i))) {
-                Const->getType() == IceType_f64) {
+              if (Const->getType() == IceType_f32 ||
-              FloatUses[Const].push_back(Current);
+                  Const->getType() == IceType_f64) {
+                FloatUses[Const].push_back(Current);
+              }
            }
          }
        }
-        Current++;
+        ++Current;
      }
      for (auto &Pair : FloatUses) {
        static constexpr SizeT MinUseThreshold = 3;