[PATCH] D36806: Switch to cantFail(), since it does the same assertion.

[Stephen Hines via Phabricator via cfe-commits]

srhines created this revision.
Herald added a subscriber: klimek.

https://reviews.llvm.org/D36806

Files:
  lib/Tooling/Core/Replacement.cpp


Index: lib/Tooling/Core/Replacement.cpp
===================================================================
--- lib/Tooling/Core/Replacement.cpp
+++ lib/Tooling/Core/Replacement.cpp
@@ -498,12 +498,10 @@
     return MergedRanges;
   tooling::Replacements FakeReplaces;
   for (const auto &R : MergedRanges) {
-    auto Err = FakeReplaces.add(Replacement(Replaces.begin()->getFilePath(),
-                                            R.getOffset(), R.getLength(),
-                                            std::string(R.getLength(), ' ')));
-    assert(!Err &&
-           "Replacements must not conflict since ranges have been merged.");
-    llvm::consumeError(std::move(Err));
+    // Replacements must not conflict since ranges have been merged.
+    llvm::cantFail(FakeReplaces.add(
+        Replacement(Replaces.begin()->getFilePath(), R.getOffset(),
+                    R.getLength(), std::string(R.getLength(), ' '))));
   }
   return FakeReplaces.merge(Replaces).getAffectedRanges();
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36806.111414.patch
Type: text/x-patch
Size: 998 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170816/1b32660a/attachment.bin>