Merge remote-tracking branch 'origin/master' into ast-memory-layout

Conflicts:
 * lib/std/zig/ast.zig
 * lib/std/zig/parse.zig
 * lib/std/zig/parser_test.zig
 * lib/std/zig/render.zig
 * src/Module.zig
 * src/zir.zig

I resolved some of the conflicts by reverting a small portion of
@tadeokondrak's stage2 logic here regarding `callconv(.Inline)`.
It will need to get reworked as part of this branch.

1 files changed, 0 insertions, 11 deletions

diff --git a/src/stage1/ir_print.cpp b/src/stage1/ir_print.cpp
index 572551e615..98d349012e 100644
--- a/src/stage1/ir_print.cpp
+++ b/src/stage1/ir_print.cpp
@@ -282,8 +282,6 @@ const char* ir_inst_src_type_str(IrInstSrcId id) {
             return "SrcPanic";
         case IrInstSrcIdTagName:
             return "SrcTagName";
-        case IrInstSrcIdTagType:
-            return "SrcTagType";
         case IrInstSrcIdFieldParentPtr:
             return "SrcFieldParentPtr";
         case IrInstSrcIdByteOffsetOf:
@@ -2354,12 +2352,6 @@ static void ir_print_arg_type(IrPrintSrc *irp, IrInstSrcArgType *instruction) {
     fprintf(irp->f, ")");
 }
 
-static void ir_print_enum_tag_type(IrPrintSrc *irp, IrInstSrcTagType *instruction) {
-    fprintf(irp->f, "@TagType(");
-    ir_print_other_inst_src(irp, instruction->target);
-    fprintf(irp->f, ")");
-}
-
 static void ir_print_export(IrPrintSrc *irp, IrInstSrcExport *instruction) {
     fprintf(irp->f, "@export(");
     ir_print_other_inst_src(irp, instruction->target);
@@ -2953,9 +2945,6 @@ static void ir_print_inst_src(IrPrintSrc *irp, IrInstSrc *instruction, bool trai
         case IrInstSrcIdArgType:
             ir_print_arg_type(irp, (IrInstSrcArgType *)instruction);
             break;
-        case IrInstSrcIdTagType:
-            ir_print_enum_tag_type(irp, (IrInstSrcTagType *)instruction);
-            break;
         case IrInstSrcIdExport:
             ir_print_export(irp, (IrInstSrcExport *)instruction);
             break;