Merge remote-tracking branch 'origin/master' into llvm6

1 files changed, 14 insertions, 7 deletions

diff --git a/src/ir_print.cpp b/src/ir_print.cpp
index 930d22f21a..8332212d34 100644
--- a/src/ir_print.cpp
+++ b/src/ir_print.cpp
@@ -368,11 +368,15 @@ static void ir_print_union_field_ptr(IrPrint *irp, IrInstructionUnionFieldPtr *i
     fprintf(irp->f, ")");
 }
 
-static void ir_print_set_debug_safety(IrPrint *irp, IrInstructionSetDebugSafety *instruction) {
-    fprintf(irp->f, "@setDebugSafety(");
-    ir_print_other_instruction(irp, instruction->scope_value);
-    fprintf(irp->f, ", ");
-    ir_print_other_instruction(irp, instruction->debug_safety_on);
+static void ir_print_set_cold(IrPrint *irp, IrInstructionSetCold *instruction) {
+    fprintf(irp->f, "@setCold(");
+    ir_print_other_instruction(irp, instruction->is_cold);
+    fprintf(irp->f, ")");
+}
+
+static void ir_print_set_runtime_safety(IrPrint *irp, IrInstructionSetRuntimeSafety *instruction) {
+    fprintf(irp->f, "@setRuntimeSafety(");
+    ir_print_other_instruction(irp, instruction->safety_on);
     fprintf(irp->f, ")");
 }
 
@@ -1081,8 +1085,11 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
         case IrInstructionIdUnionFieldPtr:
             ir_print_union_field_ptr(irp, (IrInstructionUnionFieldPtr *)instruction);
             break;
-        case IrInstructionIdSetDebugSafety:
-            ir_print_set_debug_safety(irp, (IrInstructionSetDebugSafety *)instruction);
+        case IrInstructionIdSetCold:
+            ir_print_set_cold(irp, (IrInstructionSetCold *)instruction);
+            break;
+        case IrInstructionIdSetRuntimeSafety:
+            ir_print_set_runtime_safety(irp, (IrInstructionSetRuntimeSafety *)instruction);
             break;
         case IrInstructionIdSetFloatMode:
             ir_print_set_float_mode(irp, (IrInstructionSetFloatMode *)instruction);