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

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ir_print.cpp b/src/ir_print.cpp
index 1c60d68628..55ad3ceb6c 100644
--- a/src/ir_print.cpp
+++ b/src/ir_print.cpp
@@ -290,6 +290,15 @@ static void ir_print_struct_init(IrPrint *irp, IrInstructionStructInit *instruct
     fprintf(irp->f, "} // struct init");
 }
 
+static void ir_print_union_init(IrPrint *irp, IrInstructionUnionInit *instruction) {
+    Buf *field_name = instruction->field->name;
+
+    fprintf(irp->f, "%s {", buf_ptr(&instruction->union_type->name));
+    fprintf(irp->f, ".%s = ", buf_ptr(field_name));
+    ir_print_other_instruction(irp, instruction->init_value);
+    fprintf(irp->f, "} // union init");
+}
+
 static void ir_print_unreachable(IrPrint *irp, IrInstructionUnreachable *instruction) {
     fprintf(irp->f, "unreachable");
 }
@@ -359,6 +368,13 @@ static void ir_print_enum_field_ptr(IrPrint *irp, IrInstructionEnumFieldPtr *ins
     fprintf(irp->f, ")");
 }
 
+static void ir_print_union_field_ptr(IrPrint *irp, IrInstructionUnionFieldPtr *instruction) {
+    fprintf(irp->f, "@UnionFieldPtr(&");
+    ir_print_other_instruction(irp, instruction->union_ptr);
+    fprintf(irp->f, ".%s", buf_ptr(instruction->field->name));
+    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);
@@ -1023,6 +1039,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
         case IrInstructionIdStructInit:
             ir_print_struct_init(irp, (IrInstructionStructInit *)instruction);
             break;
+        case IrInstructionIdUnionInit:
+            ir_print_union_init(irp, (IrInstructionUnionInit *)instruction);
+            break;
         case IrInstructionIdUnreachable:
             ir_print_unreachable(irp, (IrInstructionUnreachable *)instruction);
             break;
@@ -1056,6 +1075,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
         case IrInstructionIdEnumFieldPtr:
             ir_print_enum_field_ptr(irp, (IrInstructionEnumFieldPtr *)instruction);
             break;
+        case IrInstructionIdUnionFieldPtr:
+            ir_print_union_field_ptr(irp, (IrInstructionUnionFieldPtr *)instruction);
+            break;
         case IrInstructionIdSetDebugSafety:
             ir_print_set_debug_safety(irp, (IrInstructionSetDebugSafety *)instruction);
             break;