---

yaml
---
r: 349355
b: refs/heads/master-next
c: 0b86c1e
h: refs/heads/master
i:
  349353: 3fe8992
  349351: d75f7b1

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 09dcaf930859c1f75050dcc61e82d2482c2ac868
+refs/heads/master-next: 0b86c1ef4311464f1894f2330432f232f4b64525
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/SILOptimizer/Utils/ConstantFolding.cpp

@@ -1784,6 +1784,33 @@ ConstantFolder::processWorkList() {
           WorkList.insert(User);
         }
 
+        // See if we have a CondFailMessage. If we do, see if we can transform
+        // it into a UTF8.
+        if (auto *bi = dyn_cast<BuiltinInst>(User)) {
+          if (auto kind = bi->getBuiltinKind()) {
+            if (*kind == BuiltinValueKind::CondFailMessage) {
+              // See if our original instruction was a string literal inst.
+              if (auto *sli = dyn_cast<StringLiteralInst>(I)) {
+                if (sli->getEncoding() == StringLiteralInst::Encoding::UTF8) {
+                  SILBuilderWithScope builder(bi);
+                  auto *cfi = builder.createCondFail(
+                      bi->getLoc(), bi->getOperand(0), sli->getValue());
+                  WorkList.insert(cfi);
+                  recursivelyDeleteTriviallyDeadInstructions(
+                      bi, /*force*/ true,
+                      [&](SILInstruction *DeadI) { WorkList.remove(DeadI); });
+                  InvalidateInstructions = true;
+                  continue;
+                }
+              }
+
+              // If we weren't able to simplify into a cond_fail, add it to the
+              // folded user set to see if the condfail msg is dead.
+              FoldedUsers.insert(bi);
+            }
+          }
+        }
+
         // Initialize ResultsInError as a None optional.
         //
         // We are essentially using this optional to represent 3 states: true,

branches/master-next/test/SILOptimizer/constant_propagation.sil

@@ -988,3 +988,19 @@ bb0:
   %2 = builtin "ptrtoint_Int32"(%1 : $Builtin.RawPointer) : $Builtin.Int32
   return %2 : $Builtin.Int32
 }
+
+// Make sure that we perform the transformation, but do not eliminate the int1,
+// since we do not know what it is.
+//
+// CHECK-LABEL: sil @cond_fail_test : $@convention(thin) (Builtin.Int1) -> () {
+// CHECK-NOT: builtin
+// CHECK: cond_fail
+// CHECK-NOT: builtin
+// CHECK: } // end sil function 'cond_fail_test'
+sil @cond_fail_test : $@convention(thin) (Builtin.Int1) -> () {
+bb0(%0 : $Builtin.Int1):
+  %1 = string_literal utf8 "constant"
+  %2 = builtin "condfail_message"(%0 : $Builtin.Int1, %1 : $Builtin.RawPointer) : $()
+  %9999 = tuple()
+  return %9999 : $()
+}