[silgen] Clean up RValue::isPlus{One,Zero}().

mhuusko5 · Jul 26, 2017 · f043996 · f043996
1 parent a701b59
commit f043996
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/SILGen/RValue.cpp b/lib/SILGen/RValue.cpp
@@ -787,19 +787,18 @@ void RValue::verifyConsistentOwnership() const {
 }
 
 bool RValue::isPlusOne(SILGenFunction &SGF) const & {
-  return llvm::none_of(values, [&SGF](ManagedValue mv) -> bool {
+  return llvm::all_of(values, [&SGF](ManagedValue mv) -> bool {
+    // Ignore trivial values and objects with trivial value ownership kind.
     if (mv.getType().isTrivial(SGF.F.getModule()) ||
-        mv.getOwnershipKind() == ValueOwnershipKind::Trivial)
-      return false;
-    return !mv.hasCleanup();
+        (mv.getType().isObject() &&
+         mv.getOwnershipKind() == ValueOwnershipKind::Trivial))
+      return true;
+    return mv.hasCleanup();
   });
 }
 
 bool RValue::isPlusZero(SILGenFunction &SGF) const & {
   return llvm::none_of(values, [&SGF](ManagedValue mv) -> bool {
-    if (mv.getType().isTrivial(SGF.F.getModule()) ||
-        mv.getOwnershipKind() == ValueOwnershipKind::Trivial)
-      return false;
     return mv.hasCleanup();
   });
 }