[embedded] Use cond_fail in throw-as-traps mode

Author: kubamracek

lib/SILGen/SILGenStmt.cpp

@@ -762,8 +762,7 @@ void StmtEmitter::visitReturnStmt(ReturnStmt *S) {
 
 void StmtEmitter::visitThrowStmt(ThrowStmt *S) {
   if (SGF.getASTContext().LangOpts.ThrowsAsTraps) {
-    SGF.B.createBuiltin(S, SGF.SGM.getASTContext().getIdentifier("int_trap"),
-                        SGF.SGM.Types.getEmptyTupleType(), {}, {});
+    SGF.B.createUnconditionalFail(S, "throw turned into a trap");
     SGF.B.createUnreachable(S);
     return;
   }
@@ -1483,8 +1482,7 @@ void SILGenFunction::emitThrow(SILLocation loc, ManagedValue exnMV,
          "calling emitThrow with invalid throw destination!");
 
   if (getASTContext().LangOpts.ThrowsAsTraps) {
-    B.createBuiltin(loc, SGM.getASTContext().getIdentifier("int_trap"),
-                    SGM.Types.getEmptyTupleType(), {}, {});
+    B.createUnconditionalFail(loc, "throw turned into a trap");
     B.createUnreachable(loc);
     return;
   }

test/embedded/throw-trap.swift

@@ -28,13 +28,15 @@ public func catching1() {
 // CHECK-TRAPS-SIL:      sil @$s4main9throwing1SiyKF : $@convention(thin) () -> (Int, @error any Error) {
 // CHECK-TRAPS-SIL-NEXT: bb0:
 // CHECK-TRAPS-SIL-NEXT:   debug_value
-// CHECK-TRAPS-SIL-NEXT:   %1 = builtin "int_trap"
+// CHECK-TRAPS-SIL-NEXT:   %1 = integer_literal $Builtin.Int1, -1
+// CHECK-TRAPS-SIL-NEXT:   cond_fail %1 : $Builtin.Int1, "throw turned into a trap"
 // CHECK-TRAPS-SIL-NEXT:   unreachable
 // CHECK-TRAPS-SIL-NEXT: }
 
 
 // CHECK-TRAPS-IR:      define {{.*}}@"$s4main9throwing1SiyKF"{{.*}}{
 // CHECK-TRAPS-IR-NEXT: entry:
-// CHECK-TRAPS-IR-NEXT:   call void @llvm.trap()
+// CHECK-TRAPS-IR:        call void @llvm.trap()
 // CHECK-TRAPS-IR-NEXT:   unreachable
 // CHECK-TRAPS-IR-NEXT: }
+// CHECK-TRAPS-IR:      define {{.*}}@"$s4main9catching1yyF"{{.*}}{