Commit b30c5380765bea26647a72ec55f9191824e00d4e | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-08-24 15:42:30-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-08-24 15:42:30-07:00
log	b30c5380765bea26647a72ec55f9191824e00d4e
tree	7c3df86465e4319d4ed1b237d6b0f1fa3f166e81
parent	fd9f509d6dcad43f5b1bf17e57b1f0b200755df8
parent	16d54c70eb35b58e871c538bf172991aa81191fe

Merge branch 'Vexu-stage2'

closes #6148

6 files changed, 662 insertions(+), 76 deletions(-)

src-self-hosted

src-self-hosted/Module.zig+42

...	@@ -80,6 +80,9 @@ deletion_set: std.ArrayListUnmanaged(*Decl) = .{},	...	@@ -80,6 +80,9 @@ deletion_set: std.ArrayListUnmanaged(*Decl) = .{},
80	root_name: []u8,	80	root_name: []u8,
81	keep_source_files_loaded: bool,	81	keep_source_files_loaded: bool,
82		82
		83	/// Error tags and their values, tag names are duped with mod.gpa.
		84	global_error_set: std.StringHashMapUnmanaged(u16) = .{},
		85
83	pub const InnerError = error{ OutOfMemory, AnalysisFail };	86	pub const InnerError = error{ OutOfMemory, AnalysisFail };
84		87
85	const WorkItem = union(enum) {	88	const WorkItem = union(enum) {
...	@@ -928,6 +931,11 @@ pub fn deinit(self: *Module) void {	...	@@ -928,6 +931,11 @@ pub fn deinit(self: *Module) void {
928		931
929	self.symbol_exports.deinit(gpa);	932	self.symbol_exports.deinit(gpa);
930	self.root_scope.destroy(gpa);	933	self.root_scope.destroy(gpa);
		934
		935	for (self.global_error_set.items()) \|entry\| {
		936	gpa.free(entry.key);
		937	}
		938	self.global_error_set.deinit(gpa);
931	self.* = undefined;	939	self.* = undefined;
932	}	940	}
933		941
...	@@ -2072,6 +2080,18 @@ fn createNewDecl(	...	@@ -2072,6 +2080,18 @@ fn createNewDecl(
2072	return new_decl;	2080	return new_decl;
2073	}	2081	}
2074		2082
		2083	/// Get error value for error tag `name`.
		2084	pub fn getErrorValue(self: *Module, name: []const u8) !std.StringHashMapUnmanaged(u16).Entry {
		2085	const gop = try self.global_error_set.getOrPut(self.gpa, name);
		2086	if (gop.found_existing)
		2087	return gop.entry.*;
		2088	errdefer self.global_error_set.removeAssertDiscard(name);
		2089
		2090	gop.entry.key = try self.gpa.dupe(u8, name);
		2091	gop.entry.value = @intCast(u16, self.global_error_set.items().len - 1);
		2092	return gop.entry.*;
		2093	}
		2094
2075	/// TODO split this into `requireRuntimeBlock` and `requireFunctionBlock` and audit callsites.	2095	/// TODO split this into `requireRuntimeBlock` and `requireFunctionBlock` and audit callsites.
2076	pub fn requireRuntimeBlock(self: Module, scope: Scope, src: usize) !*Scope.Block {	2096	pub fn requireRuntimeBlock(self: Module, scope: Scope, src: usize) !*Scope.Block {
2077	return scope.cast(Scope.Block) orelse	2097	return scope.cast(Scope.Block) orelse
...	@@ -3309,6 +3329,28 @@ pub fn arrayType(self: Module, scope: Scope, len: u64, sentinel: ?Value, elem_	...	@@ -3309,6 +3329,28 @@ pub fn arrayType(self: Module, scope: Scope, len: u64, sentinel: ?Value, elem_
3309	return Type.initPayload(&payload.base);	3329	return Type.initPayload(&payload.base);
3310	}	3330	}
3311		3331
		3332	pub fn errorUnionType(self: Module, scope: Scope, error_set: Type, payload: Type) Allocator.Error!Type {
		3333	assert(error_set.zigTypeTag() == .ErrorSet);
		3334	if (error_set.eql(Type.initTag(.anyerror)) and payload.eql(Type.initTag(.void))) {
		3335	return Type.initTag(.anyerror_void_error_union);
		3336	}
		3337
		3338	const result = try scope.arena().create(Type.Payload.ErrorUnion);
		3339	result.* = .{
		3340	.error_set = error_set,
		3341	.payload = payload,
		3342	};
		3343	return Type.initPayload(&result.base);
		3344	}
		3345
		3346	pub fn anyframeType(self: Module, scope: Scope, return_type: Type) Allocator.Error!Type {
		3347	const result = try scope.arena().create(Type.Payload.AnyFrame);
		3348	result.* = .{
		3349	.return_type = return_type,
		3350	};
		3351	return Type.initPayload(&result.base);
		3352	}
		3353
3312	pub fn dumpInst(self: Module, scope: Scope, inst: *Inst) void {	3354	pub fn dumpInst(self: Module, scope: Scope, inst: *Inst) void {
3313	const zir_module = scope.namespace();	3355	const zir_module = scope.namespace();
3314	const source = zir_module.getSource(self) catch @panic("dumpInst failed to get source");	3356	const source = zir_module.getSource(self) catch @panic("dumpInst failed to get source");

src-self-hosted/astgen.zig+100-61

 @@ -232,6 +232,11 @@ pub fn expr(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node) InnerEr
         .BoolAnd => return boolBinOp(mod, scope, rl, node.castTag(.BoolAnd).?),
         .BoolOr => return boolBinOp(mod, scope, rl, node.castTag(.BoolOr).?),
+        .BoolNot => return rlWrap(mod, scope, rl, try boolNot(mod, scope, node.castTag(.BoolNot).?)),
+        .BitNot => return rlWrap(mod, scope, rl, try bitNot(mod, scope, node.castTag(.BitNot).?)),
+        .Negation => return rlWrap(mod, scope, rl, try negation(mod, scope, node.castTag(.Negation).?, .sub)),
+        .NegationWrap => return rlWrap(mod, scope, rl, try negation(mod, scope, node.castTag(.NegationWrap).?, .subwrap)),
         .Identifier => return try identifier(mod, scope, rl, node.castTag(.Identifier).?),
         .Asm => return rlWrap(mod, scope, rl, try assembly(mod, scope, node.castTag(.Asm).?)),
         .StringLiteral => return rlWrap(mod, scope, rl, try stringLiteral(mod, scope, node.castTag(.StringLiteral).?)),
 @@ -242,9 +247,8 @@ pub fn expr(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node) InnerEr
         .Return => return ret(mod, scope, node.castTag(.Return).?),
         .If => return ifExpr(mod, scope, rl, node.castTag(.If).?),
         .While => return whileExpr(mod, scope, rl, node.castTag(.While).?),
-        .Period => return rlWrap(mod, scope, rl, try field(mod, scope, node.castTag(.Period).?)),
+        .Period => return field(mod, scope, rl, node.castTag(.Period).?),
         .Deref => return rlWrap(mod, scope, rl, try deref(mod, scope, node.castTag(.Deref).?)),
-        .BoolNot => return rlWrap(mod, scope, rl, try boolNot(mod, scope, node.castTag(.BoolNot).?)),
         .AddressOf => return rlWrap(mod, scope, rl, try addressOf(mod, scope, node.castTag(.AddressOf).?)),
         .FloatLiteral => return rlWrap(mod, scope, rl, try floatLiteral(mod, scope, node.castTag(.FloatLiteral).?)),
         .UndefinedLiteral => return rlWrap(mod, scope, rl, try undefLiteral(mod, scope, node.castTag(.UndefinedLiteral).?)),
 @@ -263,17 +267,17 @@ pub fn expr(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node) InnerEr
         .MultilineStringLiteral => return rlWrap(mod, scope, rl, try multilineStrLiteral(mod, scope, node.castTag(.MultilineStringLiteral).?)),
         .CharLiteral => return rlWrap(mod, scope, rl, try charLiteral(mod, scope, node.castTag(.CharLiteral).?)),
         .SliceType => return rlWrap(mod, scope, rl, try sliceType(mod, scope, node.castTag(.SliceType).?)),
+        .ErrorUnion => return rlWrap(mod, scope, rl, try typeInixOp(mod, scope, node.castTag(.ErrorUnion).?, .error_union_type)),
+        .MergeErrorSets => return rlWrap(mod, scope, rl, try typeInixOp(mod, scope, node.castTag(.MergeErrorSets).?, .merge_error_sets)),
+        .AnyFrameType => return rlWrap(mod, scope, rl, try anyFrameType(mod, scope, node.castTag(.AnyFrameType).?)),
+        .ErrorSetDecl => return errorSetDecl(mod, scope, rl, node.castTag(.ErrorSetDecl).?),
+        .ErrorType => return rlWrap(mod, scope, rl, try errorType(mod, scope, node.castTag(.ErrorType).?)),
         .Defer => return mod.failNode(scope, node, "TODO implement astgen.expr for .Defer", .{}),
         .Catch => return mod.failNode(scope, node, "TODO implement astgen.expr for .Catch", .{}),
-        .ErrorUnion => return mod.failNode(scope, node, "TODO implement astgen.expr for .ErrorUnion", .{}),
-        .MergeErrorSets => return mod.failNode(scope, node, "TODO implement astgen.expr for .MergeErrorSets", .{}),
         .Range => return mod.failNode(scope, node, "TODO implement astgen.expr for .Range", .{}),
         .OrElse => return mod.failNode(scope, node, "TODO implement astgen.expr for .OrElse", .{}),
         .Await => return mod.failNode(scope, node, "TODO implement astgen.expr for .Await", .{}),
-        .BitNot => return mod.failNode(scope, node, "TODO implement astgen.expr for .BitNot", .{}),
-        .Negation => return mod.failNode(scope, node, "TODO implement astgen.expr for .Negation", .{}),
-        .NegationWrap => return mod.failNode(scope, node, "TODO implement astgen.expr for .NegationWrap", .{}),
         .Resume => return mod.failNode(scope, node, "TODO implement astgen.expr for .Resume", .{}),
         .Try => return mod.failNode(scope, node, "TODO implement astgen.expr for .Try", .{}),
         .Slice => return mod.failNode(scope, node, "TODO implement astgen.expr for .Slice", .{}),
 @@ -287,10 +291,7 @@ pub fn expr(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node) InnerEr
         .Suspend => return mod.failNode(scope, node, "TODO implement astgen.expr for .Suspend", .{}),
         .Continue => return mod.failNode(scope, node, "TODO implement astgen.expr for .Continue", .{}),
         .AnyType => return mod.failNode(scope, node, "TODO implement astgen.expr for .AnyType", .{}),
-        .ErrorType => return mod.failNode(scope, node, "TODO implement astgen.expr for .ErrorType", .{}),
         .FnProto => return mod.failNode(scope, node, "TODO implement astgen.expr for .FnProto", .{}),
-        .AnyFrameType => return mod.failNode(scope, node, "TODO implement astgen.expr for .AnyFrameType", .{}),
-        .ErrorSetDecl => return mod.failNode(scope, node, "TODO implement astgen.expr for .ErrorSetDecl", .{}),
         .ContainerDecl => return mod.failNode(scope, node, "TODO implement astgen.expr for .ContainerDecl", .{}),
         .Comptime => return mod.failNode(scope, node, "TODO implement astgen.expr for .Comptime", .{}),
         .Nosuspend => return mod.failNode(scope, node, "TODO implement astgen.expr for .Nosuspend", .{}),
 @@ -458,7 +459,9 @@ fn varDecl(
     const tree = scope.tree();
     const name_src = tree.token_locs[node.name_token].start;
     const ident_name = try identifierTokenString(mod, scope, node.name_token);
-    const init_node = node.getTrailer("init_node").?;
+    const init_node = node.getTrailer("init_node") orelse
+        return mod.fail(scope, name_src, "variables must be initialized", .{});
     switch (tree.token_ids[node.mut_token]) {
         .Keyword_const => {
             // Depending on the type of AST the initialization expression is, we may need an lvalue
 @@ -554,6 +557,26 @@ fn boolNot(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp) InnerErr
     return addZIRUnOp(mod, scope, src, .boolnot, operand);
 }
+fn bitNot(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.op_token].start;
+    const operand = try expr(mod, scope, .none, node.rhs);
+    return addZIRUnOp(mod, scope, src, .bitnot, operand);
+}
+fn negation(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp, op_inst_tag: zir.Inst.Tag) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.op_token].start;
+    const lhs = try addZIRInstConst(mod, scope, src, .{
+        .ty = Type.initTag(.comptime_int),
+        .val = Value.initTag(.zero),
+    });
+    const rhs = try expr(mod, scope, .none, node.rhs);
+    return addZIRBinOp(mod, scope, src, op_inst_tag, lhs, rhs);
+}
 fn addressOf(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp) InnerError!*zir.Inst {
     return expr(mod, scope, .ref, node.rhs);
 }
 @@ -561,11 +584,7 @@ fn addressOf(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp) InnerE
 fn optionalType(mod: *Module, scope: *Scope, node: *ast.Node.SimplePrefixOp) InnerError!*zir.Inst {
     const tree = scope.tree();
     const src = tree.token_locs[node.op_token].start;
-    const meta_type = try addZIRInstConst(mod, scope, src, .{
+    const operand = try typeExpr(mod, scope, node.rhs);
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
-    const operand = try expr(mod, scope, .{ .ty = meta_type }, node.rhs);
     return addZIRUnOp(mod, scope, src, .optional_type, operand);
 }
 @@ -590,18 +609,13 @@ fn ptrType(mod: *Module, scope: *Scope, node: *ast.Node.PtrType) InnerError!*zir
 }
 fn ptrSliceType(mod: *Module, scope: *Scope, src: usize, ptr_info: *ast.PtrInfo, rhs: *ast.Node, size: std.builtin.TypeInfo.Pointer.Size) InnerError!*zir.Inst {
-    const meta_type = try addZIRInstConst(mod, scope, src, .{
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
     const simple = ptr_info.allowzero_token == null and
         ptr_info.align_info == null and
         ptr_info.volatile_token == null and
         ptr_info.sentinel == null;
     if (simple) {
-        const child_type = try expr(mod, scope, .{ .ty = meta_type }, rhs);
+        const child_type = try typeExpr(mod, scope, rhs);
         const mutable = ptr_info.const_token == null;
         // TODO stage1 type inference bug
         const T = zir.Inst.Tag;
 @@ -629,7 +643,7 @@ fn ptrSliceType(mod: *Module, scope: *Scope, src: usize, ptr_info: *ast.PtrInfo,
         kw_args.sentinel = try expr(mod, scope, .none, some);
     }
-    const child_type = try expr(mod, scope, .{ .ty = meta_type }, rhs);
+    const child_type = try typeExpr(mod, scope, rhs);
     if (kw_args.sentinel) |some| {
         kw_args.sentinel = try addZIRBinOp(mod, scope, some.src, .as, child_type, some);
     }
 @@ -640,10 +654,6 @@ fn ptrSliceType(mod: *Module, scope: *Scope, src: usize, ptr_info: *ast.PtrInfo,
 fn arrayType(mod: *Module, scope: *Scope, node: *ast.Node.ArrayType) !*zir.Inst {
     const tree = scope.tree();
     const src = tree.token_locs[node.op_token].start;
-    const meta_type = try addZIRInstConst(mod, scope, src, .{
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
     const usize_type = try addZIRInstConst(mod, scope, src, .{
         .ty = Type.initTag(.type),
         .val = Value.initTag(.usize_type),
 @@ -651,18 +661,14 @@ fn arrayType(mod: *Module, scope: *Scope, node: *ast.Node.ArrayType) !*zir.Inst
     // TODO check for [_]T
     const len = try expr(mod, scope, .{ .ty = usize_type }, node.len_expr);
-    const child_type = try expr(mod, scope, .{ .ty = meta_type }, node.rhs);
+    const elem_type = try typeExpr(mod, scope, node.rhs);
-    return addZIRBinOp(mod, scope, src, .array_type, len, child_type);
+    return addZIRBinOp(mod, scope, src, .array_type, len, elem_type);
 }
 fn arrayTypeSentinel(mod: *Module, scope: *Scope, node: *ast.Node.ArrayTypeSentinel) !*zir.Inst {
     const tree = scope.tree();
     const src = tree.token_locs[node.op_token].start;
-    const meta_type = try addZIRInstConst(mod, scope, src, .{
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
     const usize_type = try addZIRInstConst(mod, scope, src, .{
         .ty = Type.initTag(.type),
         .val = Value.initTag(.usize_type),
 @@ -671,7 +677,7 @@ fn arrayTypeSentinel(mod: *Module, scope: *Scope, node: *ast.Node.ArrayTypeSenti
     // TODO check for [_]T
     const len = try expr(mod, scope, .{ .ty = usize_type }, node.len_expr);
     const sentinel_uncasted = try expr(mod, scope, .none, node.sentinel);
-    const elem_type = try expr(mod, scope, .{ .ty = meta_type }, node.rhs);
+    const elem_type = try typeExpr(mod, scope, node.rhs);
     const sentinel = try addZIRBinOp(mod, scope, src, .as, elem_type, sentinel_uncasted);
     return addZIRInst(mod, scope, src, zir.Inst.ArrayTypeSentinel, .{
 @@ -681,6 +687,28 @@ fn arrayTypeSentinel(mod: *Module, scope: *Scope, node: *ast.Node.ArrayTypeSenti
     }, .{});
 }
+fn anyFrameType(mod: *Module, scope: *Scope, node: *ast.Node.AnyFrameType) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.anyframe_token].start;
+    if (node.result) |some| {
+        const return_type = try typeExpr(mod, scope, some.return_type);
+        return addZIRUnOp(mod, scope, src, .anyframe_type, return_type);
+    } else {
+        return addZIRInstConst(mod, scope, src, .{
+            .ty = Type.initTag(.type),
+            .val = Value.initTag(.anyframe_type),
+        });
+    }
+}
+fn typeInixOp(mod: *Module, scope: *Scope, node: *ast.Node.SimpleInfixOp, op_inst_tag: zir.Inst.Tag) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.op_token].start;
+    const error_set = try typeExpr(mod, scope, node.lhs);
+    const payload = try typeExpr(mod, scope, node.rhs);
+    return addZIRBinOp(mod, scope, src, op_inst_tag, error_set, payload);
+}
 fn enumLiteral(mod: *Module, scope: *Scope, node: *ast.Node.EnumLiteral) !*zir.Inst {
     const tree = scope.tree();
     const src = tree.token_locs[node.name].start;
 @@ -694,10 +722,31 @@ fn unwrapOptional(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node.Si
     const src = tree.token_locs[node.rtoken].start;
     const operand = try expr(mod, scope, .ref, node.lhs);
-    const unwrapped_ptr = try addZIRUnOp(mod, scope, src, .unwrap_optional_safe, operand);
+    return rlWrapPtr(mod, scope, rl, try addZIRUnOp(mod, scope, src, .unwrap_optional_safe, operand));
-    if (rl == .lvalue or rl == .ref) return unwrapped_ptr;
+}
-    return rlWrap(mod, scope, rl, try addZIRUnOp(mod, scope, src, .deref, unwrapped_ptr));
+fn errorSetDecl(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node.ErrorSetDecl) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.error_token].start;
+    const decls = node.decls();
+    const fields = try scope.arena().alloc([]const u8, decls.len);
+    for (decls) |decl, i| {
+        const tag = decl.castTag(.ErrorTag).?;
+        fields[i] = try identifierTokenString(mod, scope, tag.name_token);
+    }
+    // analyzing the error set results in a decl ref, so we might need to dereference it
+    return rlWrapPtr(mod, scope, rl, try addZIRInst(mod, scope, src, zir.Inst.ErrorSet, .{ .fields = fields }, .{}));
+}
+fn errorType(mod: *Module, scope: *Scope, node: *ast.Node.OneToken) InnerError!*zir.Inst {
+    const tree = scope.tree();
+    const src = tree.token_locs[node.token].start;
+    return addZIRInstConst(mod, scope, src, .{
+        .ty = Type.initTag(.type),
+        .val = Value.initTag(.anyerror_type),
+    });
 }
 /// Return whether the identifier names of two tokens are equal. Resolves @"" tokens without allocating.
 @@ -737,16 +786,16 @@ pub fn identifierStringInst(mod: *Module, scope: *Scope, node: *ast.Node.OneToke
     return addZIRInst(mod, scope, src, zir.Inst.Str, .{ .bytes = ident_name }, .{});
 }
-fn field(mod: *Module, scope: *Scope, node: *ast.Node.SimpleInfixOp) InnerError!*zir.Inst {
+fn field(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node.SimpleInfixOp) InnerError!*zir.Inst {
-    // TODO introduce lvalues
     const tree = scope.tree();
     const src = tree.token_locs[node.op_token].start;
-    const lhs = try expr(mod, scope, .none, node.lhs);
+    const lhs = try expr(mod, scope, .ref, node.lhs);
     const field_name = try identifierStringInst(mod, scope, node.rhs.castTag(.Identifier).?);
     const pointer = try addZIRInst(mod, scope, src, zir.Inst.FieldPtr, .{ .object_ptr = lhs, .field_name = field_name }, .{});
-    return addZIRUnOp(mod, scope, src, .deref, pointer);
+    if (rl == .ref or rl == .lvalue) return pointer;
+    return rlWrap(mod, scope, rl, try addZIRUnOp(mod, scope, src, .deref, pointer));
 }
 fn deref(mod: *Module, scope: *Scope, node: *ast.Node.SimpleSuffixOp) InnerError!*zir.Inst {
 @@ -1232,12 +1281,7 @@ fn identifier(mod: *Module, scope: *Scope, rl: ResultLoc, ident: *ast.Node.OneTo
             .local_ptr => {
                 const local_ptr = s.cast(Scope.LocalPtr).?;
                 if (mem.eql(u8, local_ptr.name, ident_name)) {
-                    if (rl == .lvalue or rl == .ref) {
+                    return rlWrapPtr(mod, scope, rl, local_ptr.ptr);
-                        return local_ptr.ptr;
-                    } else {
-                        const result = try addZIRUnOp(mod, scope, src, .deref, local_ptr.ptr);
-                        return rlWrap(mod, scope, rl, result);
-                    }
                 }
                 s = local_ptr.parent;
             },
 @@ -1247,10 +1291,7 @@ fn identifier(mod: *Module, scope: *Scope, rl: ResultLoc, ident: *ast.Node.OneTo
     }
     if (mod.lookupDeclName(scope, ident_name)) |decl| {
-        const result = try addZIRInst(mod, scope, src, zir.Inst.DeclValInModule, .{ .decl = decl }, .{});
+        return rlWrapPtr(mod, scope, rl, try addZIRInst(mod, scope, src, zir.Inst.DeclValInModule, .{ .decl = decl }, .{}));
-        if (rl == .lvalue or rl == .ref)
-            return result;
-        return rlWrap(mod, scope, rl, try addZIRUnOp(mod, scope, src, .deref, result));
     }
     return mod.failNode(scope, &ident.base, "use of undeclared identifier '{}'", .{ident_name});
 @@ -1466,12 +1507,8 @@ fn simpleCast(
     try ensureBuiltinParamCount(mod, scope, call, 2);
     const tree = scope.tree();
     const src = tree.token_locs[call.builtin_token].start;
-    const type_type = try addZIRInstConst(mod, scope, src, .{
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
     const params = call.params();
-    const dest_type = try expr(mod, scope, .{ .ty = type_type }, params[0]);
+    const dest_type = try typeExpr(mod, scope, params[0]);
     const rhs = try expr(mod, scope, .none, params[1]);
     const result = try addZIRBinOp(mod, scope, src, inst_tag, dest_type, rhs);
     return rlWrap(mod, scope, rl, result);
 @@ -1533,12 +1570,8 @@ fn bitCast(mod: *Module, scope: *Scope, rl: ResultLoc, call: *ast.Node.BuiltinCa
     try ensureBuiltinParamCount(mod, scope, call, 2);
     const tree = scope.tree();
     const src = tree.token_locs[call.builtin_token].start;
-    const type_type = try addZIRInstConst(mod, scope, src, .{
-        .ty = Type.initTag(.type),
-        .val = Value.initTag(.type_type),
-    });
     const params = call.params();
-    const dest_type = try expr(mod, scope, .{ .ty = type_type }, params[0]);
+    const dest_type = try typeExpr(mod, scope, params[0]);
     switch (rl) {
         .none => {
             const operand = try expr(mod, scope, .none, params[1]);
 @@ -1852,6 +1885,12 @@ fn rlWrapVoid(mod: *Module, scope: *Scope, rl: ResultLoc, node: *ast.Node, resul
     return rlWrap(mod, scope, rl, void_inst);
 }
+fn rlWrapPtr(mod: *Module, scope: *Scope, rl: ResultLoc, ptr: *zir.Inst) InnerError!*zir.Inst {
+    if (rl == .lvalue or rl == .ref) return ptr;
+    return rlWrap(mod, scope, rl, try addZIRUnOp(mod, scope, ptr.src, .deref, ptr));
+}
 pub fn addZIRInstSpecial(
     mod: *Module,
     scope: *Scope,

src-self-hosted/type.zig+250-7

...	@@ -3,6 +3,7 @@ const Value = @import("value.zig").Value;	...	@@ -3,6 +3,7 @@ const Value = @import("value.zig").Value;
3	const assert = std.debug.assert;	3	const assert = std.debug.assert;
4	const Allocator = std.mem.Allocator;	4	const Allocator = std.mem.Allocator;
5	const Target = std.Target;	5	const Target = std.Target;
		6	const Module = @import("Module.zig");
6		7
7	/// This is the raw data, with no bookkeeping, no memory awareness, no de-duplication.	8	/// This is the raw data, with no bookkeeping, no memory awareness, no de-duplication.
8	/// It's important for this type to be small.	9	/// It's important for this type to be small.
...	@@ -52,7 +53,7 @@ pub const Type = extern union {	...	@@ -52,7 +53,7 @@ pub const Type = extern union {
52	.bool => return .Bool,	53	.bool => return .Bool,
53	.void => return .Void,	54	.void => return .Void,
54	.type => return .Type,	55	.type => return .Type,
55	.anyerror => return .ErrorSet,	56	.error_set, .error_set_single, .anyerror => return .ErrorSet,
56	.comptime_int => return .ComptimeInt,	57	.comptime_int => return .ComptimeInt,
57	.comptime_float => return .ComptimeFloat,	58	.comptime_float => return .ComptimeFloat,
58	.noreturn => return .NoReturn,	59	.noreturn => return .NoReturn,
...	@@ -84,6 +85,10 @@ pub const Type = extern union {	...	@@ -84,6 +85,10 @@ pub const Type = extern union {
84	.optional_single_mut_pointer,	85	.optional_single_mut_pointer,
85	=> return .Optional,	86	=> return .Optional,
86	.enum_literal => return .EnumLiteral,	87	.enum_literal => return .EnumLiteral,
		88
		89	.anyerror_void_error_union, .error_union => return .ErrorUnion,
		90
		91	.anyframe_T, .@"anyframe" => return .AnyFrame,
87	}	92	}
88	}	93	}
89		94
...	@@ -151,6 +156,9 @@ pub const Type = extern union {	...	@@ -151,6 +156,9 @@ pub const Type = extern union {
151	.ComptimeInt => return true,	156	.ComptimeInt => return true,
152	.Undefined => return true,	157	.Undefined => return true,
153	.Null => return true,	158	.Null => return true,
		159	.AnyFrame => {
		160	return a.elemType().eql(b.elemType());
		161	},
154	.Pointer => {	162	.Pointer => {
155	// Hot path for common case:	163	// Hot path for common case:
156	if (a.castPointer()) \|a_payload\| {	164	if (a.castPointer()) \|a_payload\| {
...	@@ -225,7 +233,6 @@ pub const Type = extern union {	...	@@ -225,7 +233,6 @@ pub const Type = extern union {
225	.BoundFn,	233	.BoundFn,
226	.Opaque,	234	.Opaque,
227	.Frame,	235	.Frame,
228	.AnyFrame,
229	.Vector,	236	.Vector,
230	=> std.debug.panic("TODO implement Type equality comparison of {} and {}", .{ a, b }),	237	=> std.debug.panic("TODO implement Type equality comparison of {} and {}", .{ a, b }),
231	}	238	}
...	@@ -343,6 +350,8 @@ pub const Type = extern union {	...	@@ -343,6 +350,8 @@ pub const Type = extern union {
343	.single_const_pointer_to_comptime_int,	350	.single_const_pointer_to_comptime_int,
344	.const_slice_u8,	351	.const_slice_u8,
345	.enum_literal,	352	.enum_literal,
		353	.anyerror_void_error_union,
		354	.@"anyframe",
346	=> unreachable,	355	=> unreachable,
347		356
348	.array_u8_sentinel_0 => return self.copyPayloadShallow(allocator, Payload.Array_u8_Sentinel0),	357	.array_u8_sentinel_0 => return self.copyPayloadShallow(allocator, Payload.Array_u8_Sentinel0),
...	@@ -397,6 +406,7 @@ pub const Type = extern union {	...	@@ -397,6 +406,7 @@ pub const Type = extern union {
397	.optional_single_mut_pointer,	406	.optional_single_mut_pointer,
398	.optional_single_const_pointer,	407	.optional_single_const_pointer,
399	=> return self.copyPayloadSingleField(allocator, Payload.PointerSimple, "pointee_type"),	408	=> return self.copyPayloadSingleField(allocator, Payload.PointerSimple, "pointee_type"),
		409	.anyframe_T => return self.copyPayloadSingleField(allocator, Payload.AnyFrame, "return_type"),
400		410
401	.pointer => {	411	.pointer => {
402	const payload = @fieldParentPtr(Payload.Pointer, "base", self.ptr_otherwise);	412	const payload = @fieldParentPtr(Payload.Pointer, "base", self.ptr_otherwise);
...	@@ -416,6 +426,19 @@ pub const Type = extern union {	...	@@ -416,6 +426,19 @@ pub const Type = extern union {
416	};	426	};
417	return Type{ .ptr_otherwise = &new_payload.base };	427	return Type{ .ptr_otherwise = &new_payload.base };
418	},	428	},
		429	.error_union => {
		430	const payload = @fieldParentPtr(Payload.ErrorUnion, "base", self.ptr_otherwise);
		431	const new_payload = try allocator.create(Payload.ErrorUnion);
		432	new_payload.* = .{
		433	.base = payload.base,
		434
		435	.error_set = try payload.error_set.copy(allocator),
		436	.payload = try payload.payload.copy(allocator),
		437	};
		438	return Type{ .ptr_otherwise = &new_payload.base };
		439	},
		440	.error_set => return self.copyPayloadShallow(allocator, Payload.ErrorSet),
		441	.error_set_single => return self.copyPayloadShallow(allocator, Payload.ErrorSetSingle),
419	}	442	}
420	}	443	}
421		444
...	@@ -482,6 +505,8 @@ pub const Type = extern union {	...	@@ -482,6 +505,8 @@ pub const Type = extern union {
482	.@"null" => return out_stream.writeAll("@TypeOf(null)"),	505	.@"null" => return out_stream.writeAll("@TypeOf(null)"),
483	.@"undefined" => return out_stream.writeAll("@TypeOf(undefined)"),	506	.@"undefined" => return out_stream.writeAll("@TypeOf(undefined)"),
484		507
		508	.@"anyframe" => return out_stream.writeAll("anyframe"),
		509	.anyerror_void_error_union => return out_stream.writeAll("anyerror!void"),
485	.const_slice_u8 => return out_stream.writeAll("[]const u8"),	510	.const_slice_u8 => return out_stream.writeAll("[]const u8"),
486	.fn_noreturn_no_args => return out_stream.writeAll("fn() noreturn"),	511	.fn_noreturn_no_args => return out_stream.writeAll("fn() noreturn"),
487	.fn_void_no_args => return out_stream.writeAll("fn() void"),	512	.fn_void_no_args => return out_stream.writeAll("fn() void"),
...	@@ -500,6 +525,12 @@ pub const Type = extern union {	...	@@ -500,6 +525,12 @@ pub const Type = extern union {
500	continue;	525	continue;
501	},	526	},
502		527
		528	.anyframe_T => {
		529	const payload = @fieldParentPtr(Payload.AnyFrame, "base", ty.ptr_otherwise);
		530	try out_stream.print("anyframe->", .{});
		531	ty = payload.return_type;
		532	continue;
		533	},
503	.array_u8 => {	534	.array_u8 => {
504	const payload = @fieldParentPtr(Payload.Array_u8, "base", ty.ptr_otherwise);	535	const payload = @fieldParentPtr(Payload.Array_u8, "base", ty.ptr_otherwise);
505	return out_stream.print("[{}]u8", .{payload.len});	536	return out_stream.print("[{}]u8", .{payload.len});
...	@@ -622,6 +653,21 @@ pub const Type = extern union {	...	@@ -622,6 +653,21 @@ pub const Type = extern union {
622	ty = payload.pointee_type;	653	ty = payload.pointee_type;
623	continue;	654	continue;
624	},	655	},
		656	.error_union => {
		657	const payload = @fieldParentPtr(Payload.ErrorUnion, "base", ty.ptr_otherwise);
		658	try payload.error_set.format("", .{}, out_stream);
		659	try out_stream.writeAll("!");
		660	ty = payload.payload;
		661	continue;
		662	},
		663	.error_set => {
		664	const payload = @fieldParentPtr(Payload.ErrorSet, "base", ty.ptr_otherwise);
		665	return out_stream.writeAll(std.mem.spanZ(payload.decl.name));
		666	},
		667	.error_set_single => {
		668	const payload = @fieldParentPtr(Payload.ErrorSetSingle, "base", ty.ptr_otherwise);
		669	return out_stream.print("error{{{}}}", .{payload.name});
		670	},
625	}	671	}
626	unreachable;	672	unreachable;
627	}	673	}
...	@@ -715,6 +761,11 @@ pub const Type = extern union {	...	@@ -715,6 +761,11 @@ pub const Type = extern union {
715	.optional,	761	.optional,
716	.optional_single_mut_pointer,	762	.optional_single_mut_pointer,
717	.optional_single_const_pointer,	763	.optional_single_const_pointer,
		764	.@"anyframe",
		765	.anyframe_T,
		766	.anyerror_void_error_union,
		767	.error_set,
		768	.error_set_single,
718	=> true,	769	=> true,
719	// TODO lazy types	770	// TODO lazy types
720	.array => self.elemType().hasCodeGenBits() and self.arrayLen() != 0,	771	.array => self.elemType().hasCodeGenBits() and self.arrayLen() != 0,
...	@@ -723,6 +774,11 @@ pub const Type = extern union {	...	@@ -723,6 +774,11 @@ pub const Type = extern union {
723	.int_signed => self.cast(Payload.IntSigned).?.bits == 0,	774	.int_signed => self.cast(Payload.IntSigned).?.bits == 0,
724	.int_unsigned => self.cast(Payload.IntUnsigned).?.bits == 0,	775	.int_unsigned => self.cast(Payload.IntUnsigned).?.bits == 0,
725		776
		777	.error_union => {
		778	const payload = self.cast(Payload.ErrorUnion).?;
		779	return payload.error_set.hasCodeGenBits() or payload.payload.hasCodeGenBits();
		780	},
		781
726	.c_void,	782	.c_void,
727	.void,	783	.void,
728	.type,	784	.type,
...	@@ -779,6 +835,8 @@ pub const Type = extern union {	...	@@ -779,6 +835,8 @@ pub const Type = extern union {
779	.mut_slice,	835	.mut_slice,
780	.optional_single_const_pointer,	836	.optional_single_const_pointer,
781	.optional_single_mut_pointer,	837	.optional_single_mut_pointer,
		838	.@"anyframe",
		839	.anyframe_T,
782	=> return @divExact(target.cpu.arch.ptrBitWidth(), 8),	840	=> return @divExact(target.cpu.arch.ptrBitWidth(), 8),
783		841
784	.pointer => {	842	.pointer => {
...	@@ -803,7 +861,11 @@ pub const Type = extern union {	...	@@ -803,7 +861,11 @@ pub const Type = extern union {
803	.f128 => return 16,	861	.f128 => return 16,
804	.c_longdouble => return 16,	862	.c_longdouble => return 16,
805		863
806	.anyerror => return 2, // TODO revisit this when we have the concept of the error tag type	864	.error_set,
		865	.error_set_single,
		866	.anyerror_void_error_union,
		867	.anyerror,
		868	=> return 2, // TODO revisit this when we have the concept of the error tag type
807		869
808	.array, .array_sentinel => return self.elemType().abiAlignment(target),	870	.array, .array_sentinel => return self.elemType().abiAlignment(target),
809		871
...	@@ -829,6 +891,16 @@ pub const Type = extern union {	...	@@ -829,6 +891,16 @@ pub const Type = extern union {
829	return child_type.abiAlignment(target);	891	return child_type.abiAlignment(target);
830	},	892	},
831		893
		894	.error_union => {
		895	const payload = self.cast(Payload.ErrorUnion).?;
		896	if (!payload.error_set.hasCodeGenBits()) {
		897	return payload.payload.abiAlignment(target);
		898	} else if (!payload.payload.hasCodeGenBits()) {
		899	return payload.error_set.abiAlignment(target);
		900	}
		901	@panic("TODO abiAlignment error union");
		902	},
		903
832	.c_void,	904	.c_void,
833	.void,	905	.void,
834	.type,	906	.type,
...	@@ -882,12 +954,15 @@ pub const Type = extern union {	...	@@ -882,12 +954,15 @@ pub const Type = extern union {
882	.i32, .u32 => return 4,	954	.i32, .u32 => return 4,
883	.i64, .u64 => return 8,	955	.i64, .u64 => return 8,
884		956
885	.isize, .usize => return @divExact(target.cpu.arch.ptrBitWidth(), 8),	957	.@"anyframe", .anyframe_T, .isize, .usize => return @divExact(target.cpu.arch.ptrBitWidth(), 8),
886		958
887	.const_slice,	959	.const_slice,
888	.mut_slice,	960	.mut_slice,
889	.const_slice_u8,	961	=> {
890	=> return @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2,	962	if (self.elemType().hasCodeGenBits()) return @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2;
		963	return @divExact(target.cpu.arch.ptrBitWidth(), 8);
		964	},
		965	.const_slice_u8 => return @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2,
891		966
892	.optional_single_const_pointer,	967	.optional_single_const_pointer,
893	.optional_single_mut_pointer,	968	.optional_single_mut_pointer,
...	@@ -923,7 +998,11 @@ pub const Type = extern union {	...	@@ -923,7 +998,11 @@ pub const Type = extern union {
923	.f128 => return 16,	998	.f128 => return 16,
924	.c_longdouble => return 16,	999	.c_longdouble => return 16,
925		1000
926	.anyerror => return 2, // TODO revisit this when we have the concept of the error tag type	1001	.error_set,
		1002	.error_set_single,
		1003	.anyerror_void_error_union,
		1004	.anyerror,
		1005	=> return 2, // TODO revisit this when we have the concept of the error tag type
927		1006
928	.int_signed, .int_unsigned => {	1007	.int_signed, .int_unsigned => {
929	const bits: u16 = if (self.cast(Payload.IntSigned)) \|pl\|	1008	const bits: u16 = if (self.cast(Payload.IntSigned)) \|pl\|
...	@@ -950,6 +1029,18 @@ pub const Type = extern union {	...	@@ -950,6 +1029,18 @@ pub const Type = extern union {
950	// to the child type's ABI alignment.	1029	// to the child type's ABI alignment.
951	return child_type.abiAlignment(target) + child_type.abiSize(target);	1030	return child_type.abiAlignment(target) + child_type.abiSize(target);
952	},	1031	},
		1032
		1033	.error_union => {
		1034	const payload = self.cast(Payload.ErrorUnion).?;
		1035	if (!payload.error_set.hasCodeGenBits() and !payload.payload.hasCodeGenBits()) {
		1036	return 0;
		1037	} else if (!payload.error_set.hasCodeGenBits()) {
		1038	return payload.payload.abiSize(target);
		1039	} else if (!payload.payload.hasCodeGenBits()) {
		1040	return payload.error_set.abiSize(target);
		1041	}
		1042	@panic("TODO abiSize error union");
		1043	},
953	};	1044	};
954	}	1045	}
955		1046
...	@@ -1010,6 +1101,12 @@ pub const Type = extern union {	...	@@ -1010,6 +1101,12 @@ pub const Type = extern union {
1010	.c_mut_pointer,	1101	.c_mut_pointer,
1011	.const_slice,	1102	.const_slice,
1012	.mut_slice,	1103	.mut_slice,
		1104	.error_union,
		1105	.@"anyframe",
		1106	.anyframe_T,
		1107	.anyerror_void_error_union,
		1108	.error_set,
		1109	.error_set_single,
1013	=> false,	1110	=> false,
1014		1111
1015	.single_const_pointer,	1112	.single_const_pointer,
...	@@ -1078,6 +1175,12 @@ pub const Type = extern union {	...	@@ -1078,6 +1175,12 @@ pub const Type = extern union {
1078	.optional_single_mut_pointer,	1175	.optional_single_mut_pointer,
1079	.optional_single_const_pointer,	1176	.optional_single_const_pointer,
1080	.enum_literal,	1177	.enum_literal,
		1178	.error_union,
		1179	.@"anyframe",
		1180	.anyframe_T,
		1181	.anyerror_void_error_union,
		1182	.error_set,
		1183	.error_set_single,
1081	=> false,	1184	=> false,
1082		1185
1083	.const_slice,	1186	.const_slice,
...	@@ -1143,6 +1246,12 @@ pub const Type = extern union {	...	@@ -1143,6 +1246,12 @@ pub const Type = extern union {
1143	.optional_single_const_pointer,	1246	.optional_single_const_pointer,
1144	.enum_literal,	1247	.enum_literal,
1145	.mut_slice,	1248	.mut_slice,
		1249	.error_union,
		1250	.@"anyframe",
		1251	.anyframe_T,
		1252	.anyerror_void_error_union,
		1253	.error_set,
		1254	.error_set_single,
1146	=> false,	1255	=> false,
1147		1256
1148	.single_const_pointer,	1257	.single_const_pointer,
...	@@ -1217,6 +1326,12 @@ pub const Type = extern union {	...	@@ -1217,6 +1326,12 @@ pub const Type = extern union {
1217	.optional_single_mut_pointer,	1326	.optional_single_mut_pointer,
1218	.optional_single_const_pointer,	1327	.optional_single_const_pointer,
1219	.enum_literal,	1328	.enum_literal,
		1329	.error_union,
		1330	.@"anyframe",
		1331	.anyframe_T,
		1332	.anyerror_void_error_union,
		1333	.error_set,
		1334	.error_set_single,
1220	=> false,	1335	=> false,
1221		1336
1222	.pointer => {	1337	.pointer => {
...	@@ -1328,6 +1443,12 @@ pub const Type = extern union {	...	@@ -1328,6 +1443,12 @@ pub const Type = extern union {
1328	.optional_single_const_pointer,	1443	.optional_single_const_pointer,
1329	.optional_single_mut_pointer,	1444	.optional_single_mut_pointer,
1330	.enum_literal,	1445	.enum_literal,
		1446	.error_union,
		1447	.@"anyframe",
		1448	.anyframe_T,
		1449	.anyerror_void_error_union,
		1450	.error_set,
		1451	.error_set_single,
1331	=> unreachable,	1452	=> unreachable,
1332		1453
1333	.array => self.cast(Payload.Array).?.elem_type,	1454	.array => self.cast(Payload.Array).?.elem_type,
...	@@ -1449,6 +1570,12 @@ pub const Type = extern union {	...	@@ -1449,6 +1570,12 @@ pub const Type = extern union {
1449	.optional_single_mut_pointer,	1570	.optional_single_mut_pointer,
1450	.optional_single_const_pointer,	1571	.optional_single_const_pointer,
1451	.enum_literal,	1572	.enum_literal,
		1573	.error_union,
		1574	.@"anyframe",
		1575	.anyframe_T,
		1576	.anyerror_void_error_union,
		1577	.error_set,
		1578	.error_set_single,
1452	=> unreachable,	1579	=> unreachable,
1453		1580
1454	.array => self.cast(Payload.Array).?.len,	1581	.array => self.cast(Payload.Array).?.len,
...	@@ -1516,6 +1643,12 @@ pub const Type = extern union {	...	@@ -1516,6 +1643,12 @@ pub const Type = extern union {
1516	.optional_single_mut_pointer,	1643	.optional_single_mut_pointer,
1517	.optional_single_const_pointer,	1644	.optional_single_const_pointer,
1518	.enum_literal,	1645	.enum_literal,
		1646	.error_union,
		1647	.@"anyframe",
		1648	.anyframe_T,
		1649	.anyerror_void_error_union,
		1650	.error_set,
		1651	.error_set_single,
1519	=> unreachable,	1652	=> unreachable,
1520		1653
1521	.array, .array_u8 => return null,	1654	.array, .array_u8 => return null,
...	@@ -1581,6 +1714,12 @@ pub const Type = extern union {	...	@@ -1581,6 +1714,12 @@ pub const Type = extern union {
1581	.optional_single_mut_pointer,	1714	.optional_single_mut_pointer,
1582	.optional_single_const_pointer,	1715	.optional_single_const_pointer,
1583	.enum_literal,	1716	.enum_literal,
		1717	.error_union,
		1718	.@"anyframe",
		1719	.anyframe_T,
		1720	.anyerror_void_error_union,
		1721	.error_set,
		1722	.error_set_single,
1584	=> false,	1723	=> false,
1585		1724
1586	.int_signed,	1725	.int_signed,
...	@@ -1649,6 +1788,12 @@ pub const Type = extern union {	...	@@ -1649,6 +1788,12 @@ pub const Type = extern union {
1649	.optional_single_mut_pointer,	1788	.optional_single_mut_pointer,
1650	.optional_single_const_pointer,	1789	.optional_single_const_pointer,
1651	.enum_literal,	1790	.enum_literal,
		1791	.error_union,
		1792	.@"anyframe",
		1793	.anyframe_T,
		1794	.anyerror_void_error_union,
		1795	.error_set,
		1796	.error_set_single,
1652	=> false,	1797	=> false,
1653		1798
1654	.int_unsigned,	1799	.int_unsigned,
...	@@ -1707,6 +1852,12 @@ pub const Type = extern union {	...	@@ -1707,6 +1852,12 @@ pub const Type = extern union {
1707	.optional_single_mut_pointer,	1852	.optional_single_mut_pointer,
1708	.optional_single_const_pointer,	1853	.optional_single_const_pointer,
1709	.enum_literal,	1854	.enum_literal,
		1855	.error_union,
		1856	.@"anyframe",
		1857	.anyframe_T,
		1858	.anyerror_void_error_union,
		1859	.error_set,
		1860	.error_set_single,
1710	=> unreachable,	1861	=> unreachable,
1711		1862
1712	.int_unsigned => .{ .signed = false, .bits = self.cast(Payload.IntUnsigned).?.bits },	1863	.int_unsigned => .{ .signed = false, .bits = self.cast(Payload.IntUnsigned).?.bits },
...	@@ -1783,6 +1934,12 @@ pub const Type = extern union {	...	@@ -1783,6 +1934,12 @@ pub const Type = extern union {
1783	.optional_single_mut_pointer,	1934	.optional_single_mut_pointer,
1784	.optional_single_const_pointer,	1935	.optional_single_const_pointer,
1785	.enum_literal,	1936	.enum_literal,
		1937	.error_union,
		1938	.@"anyframe",
		1939	.anyframe_T,
		1940	.anyerror_void_error_union,
		1941	.error_set,
		1942	.error_set_single,
1786	=> false,	1943	=> false,
1787		1944
1788	.usize,	1945	.usize,
...	@@ -1888,6 +2045,12 @@ pub const Type = extern union {	...	@@ -1888,6 +2045,12 @@ pub const Type = extern union {
1888	.optional_single_mut_pointer,	2045	.optional_single_mut_pointer,
1889	.optional_single_const_pointer,	2046	.optional_single_const_pointer,
1890	.enum_literal,	2047	.enum_literal,
		2048	.error_union,
		2049	.@"anyframe",
		2050	.anyframe_T,
		2051	.anyerror_void_error_union,
		2052	.error_set,
		2053	.error_set_single,
1891	=> unreachable,	2054	=> unreachable,
1892	};	2055	};
1893	}	2056	}
...	@@ -1959,6 +2122,12 @@ pub const Type = extern union {	...	@@ -1959,6 +2122,12 @@ pub const Type = extern union {
1959	.optional_single_mut_pointer,	2122	.optional_single_mut_pointer,
1960	.optional_single_const_pointer,	2123	.optional_single_const_pointer,
1961	.enum_literal,	2124	.enum_literal,
		2125	.error_union,
		2126	.@"anyframe",
		2127	.anyframe_T,
		2128	.anyerror_void_error_union,
		2129	.error_set,
		2130	.error_set_single,
1962	=> unreachable,	2131	=> unreachable,
1963	}	2132	}
1964	}	2133	}
...	@@ -2029,6 +2198,12 @@ pub const Type = extern union {	...	@@ -2029,6 +2198,12 @@ pub const Type = extern union {
2029	.optional_single_mut_pointer,	2198	.optional_single_mut_pointer,
2030	.optional_single_const_pointer,	2199	.optional_single_const_pointer,
2031	.enum_literal,	2200	.enum_literal,
		2201	.error_union,
		2202	.@"anyframe",
		2203	.anyframe_T,
		2204	.anyerror_void_error_union,
		2205	.error_set,
		2206	.error_set_single,
2032	=> unreachable,	2207	=> unreachable,
2033	}	2208	}
2034	}	2209	}
...	@@ -2099,6 +2274,12 @@ pub const Type = extern union {	...	@@ -2099,6 +2274,12 @@ pub const Type = extern union {
2099	.optional_single_mut_pointer,	2274	.optional_single_mut_pointer,
2100	.optional_single_const_pointer,	2275	.optional_single_const_pointer,
2101	.enum_literal,	2276	.enum_literal,
		2277	.error_union,
		2278	.@"anyframe",
		2279	.anyframe_T,
		2280	.anyerror_void_error_union,
		2281	.error_set,
		2282	.error_set_single,
2102	=> unreachable,	2283	=> unreachable,
2103	};	2284	};
2104	}	2285	}
...	@@ -2166,6 +2347,12 @@ pub const Type = extern union {	...	@@ -2166,6 +2347,12 @@ pub const Type = extern union {
2166	.optional_single_mut_pointer,	2347	.optional_single_mut_pointer,
2167	.optional_single_const_pointer,	2348	.optional_single_const_pointer,
2168	.enum_literal,	2349	.enum_literal,
		2350	.error_union,
		2351	.@"anyframe",
		2352	.anyframe_T,
		2353	.anyerror_void_error_union,
		2354	.error_set,
		2355	.error_set_single,
2169	=> unreachable,	2356	=> unreachable,
2170	};	2357	};
2171	}	2358	}
...	@@ -2233,6 +2420,12 @@ pub const Type = extern union {	...	@@ -2233,6 +2420,12 @@ pub const Type = extern union {
2233	.optional_single_mut_pointer,	2420	.optional_single_mut_pointer,
2234	.optional_single_const_pointer,	2421	.optional_single_const_pointer,
2235	.enum_literal,	2422	.enum_literal,
		2423	.error_union,
		2424	.@"anyframe",
		2425	.anyframe_T,
		2426	.anyerror_void_error_union,
		2427	.error_set,
		2428	.error_set_single,
2236	=> unreachable,	2429	=> unreachable,
2237	};	2430	};
2238	}	2431	}
...	@@ -2300,6 +2493,12 @@ pub const Type = extern union {	...	@@ -2300,6 +2493,12 @@ pub const Type = extern union {
2300	.optional_single_mut_pointer,	2493	.optional_single_mut_pointer,
2301	.optional_single_const_pointer,	2494	.optional_single_const_pointer,
2302	.enum_literal,	2495	.enum_literal,
		2496	.error_union,
		2497	.@"anyframe",
		2498	.anyframe_T,
		2499	.anyerror_void_error_union,
		2500	.error_set,
		2501	.error_set_single,
2303	=> false,	2502	=> false,
2304	};	2503	};
2305	}	2504	}
...	@@ -2351,6 +2550,12 @@ pub const Type = extern union {	...	@@ -2351,6 +2550,12 @@ pub const Type = extern union {
2351	.optional_single_mut_pointer,	2550	.optional_single_mut_pointer,
2352	.optional_single_const_pointer,	2551	.optional_single_const_pointer,
2353	.enum_literal,	2552	.enum_literal,
		2553	.anyerror_void_error_union,
		2554	.anyframe_T,
		2555	.@"anyframe",
		2556	.error_union,
		2557	.error_set,
		2558	.error_set_single,
2354	=> return null,	2559	=> return null,
2355		2560
2356	.void => return Value.initTag(.void_value),	2561	.void => return Value.initTag(.void_value),
...	@@ -2454,6 +2659,12 @@ pub const Type = extern union {	...	@@ -2454,6 +2659,12 @@ pub const Type = extern union {
2454	.optional_single_mut_pointer,	2659	.optional_single_mut_pointer,
2455	.optional_single_const_pointer,	2660	.optional_single_const_pointer,
2456	.enum_literal,	2661	.enum_literal,
		2662	.error_union,
		2663	.@"anyframe",
		2664	.anyframe_T,
		2665	.anyerror_void_error_union,
		2666	.error_set,
		2667	.error_set_single,
2457	=> return false,	2668	=> return false,
2458		2669
2459	.c_const_pointer,	2670	.c_const_pointer,
...	@@ -2511,6 +2722,8 @@ pub const Type = extern union {	...	@@ -2511,6 +2722,8 @@ pub const Type = extern union {
2511	fn_naked_noreturn_no_args,	2722	fn_naked_noreturn_no_args,
2512	fn_ccc_void_no_args,	2723	fn_ccc_void_no_args,
2513	single_const_pointer_to_comptime_int,	2724	single_const_pointer_to_comptime_int,
		2725	anyerror_void_error_union,
		2726	@"anyframe",
2514	const_slice_u8, // See last_no_payload_tag below.	2727	const_slice_u8, // See last_no_payload_tag below.
2515	// After this, the tag requires a payload.	2728	// After this, the tag requires a payload.
2516		2729
...	@@ -2533,6 +2746,10 @@ pub const Type = extern union {	...	@@ -2533,6 +2746,10 @@ pub const Type = extern union {
2533	optional,	2746	optional,
2534	optional_single_mut_pointer,	2747	optional_single_mut_pointer,
2535	optional_single_const_pointer,	2748	optional_single_const_pointer,
		2749	error_union,
		2750	anyframe_T,
		2751	error_set,
		2752	error_set_single,
2536		2753
2537	pub const last_no_payload_tag = Tag.const_slice_u8;	2754	pub const last_no_payload_tag = Tag.const_slice_u8;
2538	pub const no_payload_count = @enumToInt(last_no_payload_tag) + 1;	2755	pub const no_payload_count = @enumToInt(last_no_payload_tag) + 1;
...	@@ -2614,6 +2831,32 @@ pub const Type = extern union {	...	@@ -2614,6 +2831,32 @@ pub const Type = extern union {
2614	@"volatile": bool,	2831	@"volatile": bool,
2615	size: std.builtin.TypeInfo.Pointer.Size,	2832	size: std.builtin.TypeInfo.Pointer.Size,
2616	};	2833	};
		2834
		2835	pub const ErrorUnion = struct {
		2836	base: Payload = .{ .tag = .error_union },
		2837
		2838	error_set: Type,
		2839	payload: Type,
		2840	};
		2841
		2842	pub const AnyFrame = struct {
		2843	base: Payload = .{ .tag = .anyframe_T },
		2844
		2845	return_type: Type,
		2846	};
		2847
		2848	pub const ErrorSet = struct {
		2849	base: Payload = .{ .tag = .error_set },
		2850
		2851	decl: *Module.Decl,
		2852	};
		2853
		2854	pub const ErrorSetSingle = struct {
		2855	base: Payload = .{ .tag = .error_set_single },
		2856
		2857	/// memory is owned by `Module`
		2858	name: []const u8,
		2859	};
2617	};	2860	};
2618	};	2861	};
2619		2862

src-self-hosted/value.zig+88-3

 @@ -61,6 +61,7 @@ pub const Value = extern union {
         single_const_pointer_to_comptime_int_type,
         const_slice_u8_type,
         enum_literal_type,
+        anyframe_type,
         undef,
         zero,
 @@ -90,6 +91,8 @@ pub const Value = extern union {
         float_64,
         float_128,
         enum_literal,
+        error_set,
+        @"error",
         pub const last_no_payload_tag = Tag.bool_false;
         pub const no_payload_count = @enumToInt(last_no_payload_tag) + 1;
 @@ -168,6 +171,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .undef,
             .zero,
             .void_value,
 @@ -241,6 +245,10 @@ pub const Value = extern union {
                 };
                 return Value{ .ptr_otherwise = &new_payload.base };
             },
+            .@"error" => return self.copyPayloadShallow(allocator, Payload.Error),
+            // memory is managed by the declaration
+            .error_set => return self.copyPayloadShallow(allocator, Payload.ErrorSet),
         }
     }
 @@ -300,6 +308,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type => return out_stream.writeAll("*const comptime_int"),
             .const_slice_u8_type => return out_stream.writeAll("[]const u8"),
             .enum_literal_type => return out_stream.writeAll("@TypeOf(.EnumLiteral)"),
+            .anyframe_type => return out_stream.writeAll("anyframe"),
             .null_value => return out_stream.writeAll("null"),
             .undef => return out_stream.writeAll("undefined"),
 @@ -343,6 +352,15 @@ pub const Value = extern union {
             .float_32 => return out_stream.print("{}", .{val.cast(Payload.Float_32).?.val}),
             .float_64 => return out_stream.print("{}", .{val.cast(Payload.Float_64).?.val}),
             .float_128 => return out_stream.print("{}", .{val.cast(Payload.Float_128).?.val}),
+            .error_set => {
+                const error_set = val.cast(Payload.ErrorSet).?;
+                try out_stream.writeAll("error{");
+                for (error_set.fields.items()) |entry| {
+                    try out_stream.print("{},", .{entry.value});
+                }
+                return out_stream.writeAll("}");
+            },
+            .@"error" => return out_stream.print("error.{}", .{val.cast(Payload.Error).?.name}),
         };
     }
 @@ -363,11 +381,9 @@ pub const Value = extern union {
     }
     /// Asserts that the value is representable as a type.
-    pub fn toType(self: Value) Type {
+    pub fn toType(self: Value, allocator: *Allocator) !Type {
         return switch (self.tag()) {
             .ty => self.cast(Payload.Ty).?.ty,
-            .int_type => @panic("TODO int type to type"),
             .u8_type => Type.initTag(.u8),
             .i8_type => Type.initTag(.i8),
             .u16_type => Type.initTag(.u16),
 @@ -408,6 +424,26 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type => Type.initTag(.single_const_pointer_to_comptime_int),
             .const_slice_u8_type => Type.initTag(.const_slice_u8),
             .enum_literal_type => Type.initTag(.enum_literal),
+            .anyframe_type => Type.initTag(.@"anyframe"),
+            .int_type => {
+                const payload = self.cast(Payload.IntType).?;
+                if (payload.signed) {
+                    const new = try allocator.create(Type.Payload.IntSigned);
+                    new.* = .{ .bits = payload.bits };
+                    return Type.initPayload(&new.base);
+                } else {
+                    const new = try allocator.create(Type.Payload.IntUnsigned);
+                    new.* = .{ .bits = payload.bits };
+                    return Type.initPayload(&new.base);
+                }
+            },
+            .error_set => {
+                const payload = self.cast(Payload.ErrorSet).?;
+                const new = try allocator.create(Type.Payload.ErrorSet);
+                new.* = .{ .decl = payload.decl };
+                return Type.initPayload(&new.base);
+            },
             .undef,
             .zero,
 @@ -433,6 +469,7 @@ pub const Value = extern union {
             .float_64,
             .float_128,
             .enum_literal,
+            .@"error",
             => unreachable,
         };
     }
 @@ -482,6 +519,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -498,6 +536,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .undef => unreachable,
 @@ -560,6 +600,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -576,6 +617,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .undef => unreachable,
 @@ -638,6 +681,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -654,6 +698,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .undef => unreachable,
 @@ -742,6 +788,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -759,6 +806,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .zero,
 @@ -825,6 +874,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -841,6 +891,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .zero,
 @@ -988,6 +1040,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .bool_true,
             .bool_false,
             .null_value,
 @@ -1007,6 +1060,8 @@ pub const Value = extern union {
             .void_value,
             .unreachable_value,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .zero => false,
 @@ -1063,6 +1118,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .null_value,
             .function,
             .variable,
 @@ -1076,6 +1132,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .zero,
 @@ -1197,6 +1255,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .zero,
             .bool_true,
             .bool_false,
 @@ -1218,6 +1277,8 @@ pub const Value = extern union {
             .unreachable_value,
             .empty_array,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .ref_val => self.cast(Payload.RefVal).?.val,
 @@ -1276,6 +1337,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .zero,
             .bool_true,
             .bool_false,
 @@ -1297,6 +1359,8 @@ pub const Value = extern union {
             .void_value,
             .unreachable_value,
             .enum_literal,
+            .error_set,
+            .@"error",
             => unreachable,
             .empty_array => unreachable, // out of bounds array index
 @@ -1372,6 +1436,7 @@ pub const Value = extern union {
             .single_const_pointer_to_comptime_int_type,
             .const_slice_u8_type,
             .enum_literal_type,
+            .anyframe_type,
             .zero,
             .empty_array,
             .bool_true,
 @@ -1393,6 +1458,8 @@ pub const Value = extern union {
             .float_128,
             .void_value,
             .enum_literal,
+            .error_set,
+            .@"error",
             => false,
             .undef => unreachable,
 @@ -1522,6 +1589,24 @@ pub const Value = extern union {
             base: Payload = .{ .tag = .float_128 },
             val: f128,
         };
+        pub const ErrorSet = struct {
+            base: Payload = .{ .tag = .error_set },
+            // TODO revisit this when we have the concept of the error tag type
+            fields: std.StringHashMapUnmanaged(u16),
+            decl: *Module.Decl,
+        };
+        pub const Error = struct {
+            base: Payload = .{ .tag = .@"error" },
+            // TODO revisit this when we have the concept of the error tag type
+            /// `name` is owned by `Module` and will be valid for the entire
+            /// duration of the compilation.
+            name: []const u8,
+            value: u16,
+        };
     };
     /// Big enough to fit any non-BigInt value

src-self-hosted/zir.zig+56-1

 @@ -43,6 +43,8 @@ pub const Inst = struct {
         alloc,
         /// Same as `alloc` except the type is inferred.
         alloc_inferred,
+        /// Create an `anyframe->T`.
+        anyframe_type,
         /// Array concatenation. `a ++ b`
         array_cat,
         /// Array multiplication `a ** b`
 @@ -70,6 +72,8 @@ pub const Inst = struct {
         /// A typed result location pointer is bitcasted to a new result location pointer.
         /// The new result location pointer has an inferred type.
         bitcast_result_ptr,
+        /// Bitwise NOT. `~`
+        bitnot,
         /// Bitwise OR. `|`
         bitor,
         /// A labeled block of code, which can return a value.
 @@ -133,6 +137,10 @@ pub const Inst = struct {
         ensure_result_used,
         /// Emits a compile error if an error is ignored.
         ensure_result_non_error,
+        /// Create a `E!T` type.
+        error_union_type,
+        /// Create an error set.
+        error_set,
         /// Export the provided Decl as the provided name in the compilation's output object file.
         @"export",
         /// Given a pointer to a struct or object that contains virtual fields, returns a pointer
 @@ -160,6 +168,8 @@ pub const Inst = struct {
         /// A labeled block of code that loops forever. At the end of the body it is implied
         /// to repeat; no explicit "repeat" instruction terminates loop bodies.
         loop,
+        /// Merge two error sets into one, `E1 || E2`.
+        merge_error_sets,
         /// Ambiguously remainder division or modulus. If the computation would possibly have
         /// a different value depending on whether the operation is remainder division or modulus,
         /// a compile error is emitted. Otherwise the computation is performed.
 @@ -286,6 +296,8 @@ pub const Inst = struct {
                 .unwrap_err_safe,
                 .unwrap_err_unsafe,
                 .ensure_err_payload_void,
+                .anyframe_type,
+                .bitnot,
                 => UnOp,
                 .add,
 @@ -316,6 +328,8 @@ pub const Inst = struct {
                 .bitcast,
                 .coerce_result_ptr,
                 .xor,
+                .error_union_type,
+                .merge_error_sets,
                 => BinOp,
                 .arg => Arg,
 @@ -347,6 +361,7 @@ pub const Inst = struct {
                 .condbr => CondBr,
                 .ptr_type => PtrType,
                 .enum_literal => EnumLiteral,
+                .error_set => ErrorSet,
             };
         }
 @@ -438,6 +453,11 @@ pub const Inst = struct {
                 .ptr_type,
                 .ensure_err_payload_void,
                 .enum_literal,
+                .merge_error_sets,
+                .anyframe_type,
+                .error_union_type,
+                .bitnot,
+                .error_set,
                 => false,
                 .@"break",
 @@ -908,6 +928,16 @@ pub const Inst = struct {
         },
         kw_args: struct {},
     };
+    pub const ErrorSet = struct {
+        pub const base_tag = Tag.error_set;
+        base: Inst,
+        positionals: struct {
+            fields: [][]const u8,
+        },
+        kw_args: struct {},
+    };
 };
 pub const ErrorMsg = struct {
 @@ -1142,6 +1172,16 @@ const Writer = struct {
                 const name = self.loop_table.get(param).?;
                 return std.zig.renderStringLiteral(name, stream);
             },
+            [][]const u8 => {
+                try stream.writeByte('[');
+                for (param) |str, i| {
+                    if (i != 0) {
+                        try stream.writeAll(", ");
+                    }
+                    try std.zig.renderStringLiteral(str, stream);
+                }
+                try stream.writeByte(']');
+            },
             else => |T| @compileError("unimplemented: rendering parameter of type " ++ @typeName(T)),
         }
     }
 @@ -1539,6 +1579,21 @@ const Parser = struct {
                 const name = try self.parseStringLiteral();
                 return self.loop_table.get(name).?;
             },
+            [][]const u8 => {
+                try requireEatBytes(self, "[");
+                skipSpace(self);
+                if (eatByte(self, ']')) return &[0][]const u8{};
+                var strings = std.ArrayList([]const u8).init(&self.arena.allocator);
+                while (true) {
+                    skipSpace(self);
+                    try strings.append(try self.parseStringLiteral());
+                    skipSpace(self);
+                    if (!eatByte(self, ',')) break;
+                }
+                try requireEatBytes(self, "]");
+                return strings.toOwnedSlice();
+            },
             else => @compileError("Unimplemented: ir parseParameterGeneric for type " ++ @typeName(T)),
         }
         return self.fail("TODO parse parameter {}", .{@typeName(T)});
 @@ -1961,7 +2016,7 @@ const EmitZIR = struct {
                 return self.emitUnnamedDecl(&as_inst.base);
             },
             .Type => {
-                const ty = typed_value.val.toType();
+                const ty = try typed_value.val.toType(&self.arena.allocator);
                 return self.emitType(src, ty);
             },
             .Fn => {

src-self-hosted/zir_sema.zig+126-4

...	@@ -97,6 +97,7 @@ pub fn analyzeInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!	...	@@ -97,6 +97,7 @@ pub fn analyzeInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!
97	.array_cat => return analyzeInstArrayCat(mod, scope, old_inst.castTag(.array_cat).?),	97	.array_cat => return analyzeInstArrayCat(mod, scope, old_inst.castTag(.array_cat).?),
98	.array_mul => return analyzeInstArrayMul(mod, scope, old_inst.castTag(.array_mul).?),	98	.array_mul => return analyzeInstArrayMul(mod, scope, old_inst.castTag(.array_mul).?),
99	.bitand => return analyzeInstBitwise(mod, scope, old_inst.castTag(.bitand).?),	99	.bitand => return analyzeInstBitwise(mod, scope, old_inst.castTag(.bitand).?),
		100	.bitnot => return analyzeInstBitNot(mod, scope, old_inst.castTag(.bitnot).?),
100	.bitor => return analyzeInstBitwise(mod, scope, old_inst.castTag(.bitor).?),	101	.bitor => return analyzeInstBitwise(mod, scope, old_inst.castTag(.bitor).?),
101	.xor => return analyzeInstBitwise(mod, scope, old_inst.castTag(.xor).?),	102	.xor => return analyzeInstBitwise(mod, scope, old_inst.castTag(.xor).?),
102	.shl => return analyzeInstShl(mod, scope, old_inst.castTag(.shl).?),	103	.shl => return analyzeInstShl(mod, scope, old_inst.castTag(.shl).?),
...	@@ -122,6 +123,10 @@ pub fn analyzeInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!	...	@@ -122,6 +123,10 @@ pub fn analyzeInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!
122	.array_type => return analyzeInstArrayType(mod, scope, old_inst.castTag(.array_type).?),	123	.array_type => return analyzeInstArrayType(mod, scope, old_inst.castTag(.array_type).?),
123	.array_type_sentinel => return analyzeInstArrayTypeSentinel(mod, scope, old_inst.castTag(.array_type_sentinel).?),	124	.array_type_sentinel => return analyzeInstArrayTypeSentinel(mod, scope, old_inst.castTag(.array_type_sentinel).?),
124	.enum_literal => return analyzeInstEnumLiteral(mod, scope, old_inst.castTag(.enum_literal).?),	125	.enum_literal => return analyzeInstEnumLiteral(mod, scope, old_inst.castTag(.enum_literal).?),
		126	.merge_error_sets => return analyzeInstMergeErrorSets(mod, scope, old_inst.castTag(.merge_error_sets).?),
		127	.error_union_type => return analyzeInstErrorUnionType(mod, scope, old_inst.castTag(.error_union_type).?),
		128	.anyframe_type => return analyzeInstAnyframeType(mod, scope, old_inst.castTag(.anyframe_type).?),
		129	.error_set => return analyzeInstErrorSet(mod, scope, old_inst.castTag(.error_set).?),
125	}	130	}
126	}	131	}
127		132
...	@@ -145,7 +150,7 @@ pub fn analyzeBodyValueAsType(mod: Module, block_scope: Scope.Block, body: zir	...	@@ -145,7 +150,7 @@ pub fn analyzeBodyValueAsType(mod: Module, block_scope: Scope.Block, body: zir
145	for (block_scope.instructions.items) \|inst\| {	150	for (block_scope.instructions.items) \|inst\| {
146	if (inst.castTag(.ret)) \|ret\| {	151	if (inst.castTag(.ret)) \|ret\| {
147	const val = try mod.resolveConstValue(&block_scope.base, ret.operand);	152	const val = try mod.resolveConstValue(&block_scope.base, ret.operand);
148	return val.toType();	153	return val.toType(block_scope.base.arena());
149	} else {	154	} else {
150	return mod.fail(&block_scope.base, inst.src, "unable to resolve comptime value", .{});	155	return mod.fail(&block_scope.base, inst.src, "unable to resolve comptime value", .{});
151	}	156	}
...	@@ -270,7 +275,7 @@ fn resolveType(mod: Module, scope: Scope, old_inst: *zir.Inst) !Type {	...	@@ -270,7 +275,7 @@ fn resolveType(mod: Module, scope: Scope, old_inst: *zir.Inst) !Type {
270	const wanted_type = Type.initTag(.@"type");	275	const wanted_type = Type.initTag(.@"type");
271	const coerced_inst = try mod.coerce(scope, wanted_type, new_inst);	276	const coerced_inst = try mod.coerce(scope, wanted_type, new_inst);
272	const val = try mod.resolveConstValue(scope, coerced_inst);	277	const val = try mod.resolveConstValue(scope, coerced_inst);
273	return val.toType();	278	return val.toType(scope.arena());
274	}	279	}
275		280
276	fn resolveInt(mod: Module, scope: Scope, old_inst: *zir.Inst, dest_type: Type) !u64 {	281	fn resolveInt(mod: Module, scope: Scope, old_inst: *zir.Inst, dest_type: Type) !u64 {
...	@@ -431,6 +436,7 @@ fn analyzeInstStr(mod: Module, scope: Scope, str_inst: *zir.Inst.Str) InnerErr	...	@@ -431,6 +436,7 @@ fn analyzeInstStr(mod: Module, scope: Scope, str_inst: *zir.Inst.Str) InnerErr
431	// The bytes references memory inside the ZIR module, which can get deallocated	436	// The bytes references memory inside the ZIR module, which can get deallocated
432	// after semantic analysis is complete. We need the memory to be in the new anonymous Decl's arena.	437	// after semantic analysis is complete. We need the memory to be in the new anonymous Decl's arena.
433	var new_decl_arena = std.heap.ArenaAllocator.init(mod.gpa);	438	var new_decl_arena = std.heap.ArenaAllocator.init(mod.gpa);
		439	errdefer new_decl_arena.deinit();
434	const arena_bytes = try new_decl_arena.allocator.dupe(u8, str_inst.positionals.bytes);	440	const arena_bytes = try new_decl_arena.allocator.dupe(u8, str_inst.positionals.bytes);
435		441
436	const ty_payload = try scope.arena().create(Type.Payload.Array_u8_Sentinel0);	442	const ty_payload = try scope.arena().create(Type.Payload.Array_u8_Sentinel0);
...	@@ -716,6 +722,54 @@ fn analyzeInstArrayTypeSentinel(mod: Module, scope: Scope, array: *zir.Inst.Ar	...	@@ -716,6 +722,54 @@ fn analyzeInstArrayTypeSentinel(mod: Module, scope: Scope, array: *zir.Inst.Ar
716	return mod.constType(scope, array.base.src, try mod.arrayType(scope, len.val.toUnsignedInt(), sentinel.val, elem_type));	722	return mod.constType(scope, array.base.src, try mod.arrayType(scope, len.val.toUnsignedInt(), sentinel.val, elem_type));
717	}	723	}
718		724
		725	fn analyzeInstErrorUnionType(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {
		726	const error_union = try resolveType(mod, scope, inst.positionals.lhs);
		727	const payload = try resolveType(mod, scope, inst.positionals.rhs);
		728
		729	if (error_union.zigTypeTag() != .ErrorSet) {
		730	return mod.fail(scope, inst.base.src, "expected error set type, found {}", .{error_union.elemType()});
		731	}
		732
		733	return mod.constType(scope, inst.base.src, try mod.errorUnionType(scope, error_union, payload));
		734	}
		735
		736	fn analyzeInstAnyframeType(mod: Module, scope: Scope, inst: zir.Inst.UnOp) InnerError!Inst {
		737	const return_type = try resolveType(mod, scope, inst.positionals.operand);
		738
		739	return mod.constType(scope, inst.base.src, try mod.anyframeType(scope, return_type));
		740	}
		741
		742	fn analyzeInstErrorSet(mod: Module, scope: Scope, inst: zir.Inst.ErrorSet) InnerError!Inst {
		743	// The declarations arena will store the hashmap.
		744	var new_decl_arena = std.heap.ArenaAllocator.init(mod.gpa);
		745	errdefer new_decl_arena.deinit();
		746
		747	const payload = try scope.arena().create(Value.Payload.ErrorSet);
		748	payload.* = .{
		749	.fields = .{},
		750	.decl = undefined, // populated below
		751	};
		752	try payload.fields.ensureCapacity(&new_decl_arena.allocator, inst.positionals.fields.len);
		753
		754	for (inst.positionals.fields) \|field_name\| {
		755	const entry = try mod.getErrorValue(field_name);
		756	if (payload.fields.fetchPutAssumeCapacity(entry.key, entry.value)) \|prev\| {
		757	return mod.fail(scope, inst.base.src, "duplicate error: '{}'", .{field_name});
		758	}
		759	}
		760	// TODO create name in format "error:line:column"
		761	const new_decl = try mod.createAnonymousDecl(scope, &new_decl_arena, .{
		762	.ty = Type.initTag(.type),
		763	.val = Value.initPayload(&payload.base),
		764	});
		765	payload.decl = new_decl;
		766	return mod.analyzeDeclRef(scope, inst.base.src, new_decl);
		767	}
		768
		769	fn analyzeInstMergeErrorSets(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {
		770	return mod.fail(scope, inst.base.src, "TODO implement merge_error_sets", .{});
		771	}
		772
719	fn analyzeInstEnumLiteral(mod: Module, scope: Scope, inst: zir.Inst.EnumLiteral) InnerError!Inst {	773	fn analyzeInstEnumLiteral(mod: Module, scope: Scope, inst: zir.Inst.EnumLiteral) InnerError!Inst {
720	const payload = try scope.arena().create(Value.Payload.Bytes);	774	const payload = try scope.arena().create(Value.Payload.Bytes);
721	payload.* = .{	775	payload.* = .{
...	@@ -858,8 +912,72 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr	...	@@ -858,8 +912,72 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr
858	);	912	);
859	}	913	}
860	},	914	},
861	else => return mod.fail(scope, fieldptr.base.src, "type '{}' does not support field access", .{elem_ty}),	915	.Pointer => {
		916	const ptr_child = elem_ty.elemType();
		917	switch (ptr_child.zigTypeTag()) {
		918	.Array => {
		919	if (mem.eql(u8, field_name, "len")) {
		920	const len_payload = try scope.arena().create(Value.Payload.Int_u64);
		921	len_payload.* = .{ .int = ptr_child.arrayLen() };
		922
		923	const ref_payload = try scope.arena().create(Value.Payload.RefVal);
		924	ref_payload.* = .{ .val = Value.initPayload(&len_payload.base) };
		925
		926	return mod.constInst(scope, fieldptr.base.src, .{
		927	.ty = Type.initTag(.single_const_pointer_to_comptime_int),
		928	.val = Value.initPayload(&ref_payload.base),
		929	});
		930	} else {
		931	return mod.fail(
		932	scope,
		933	fieldptr.positionals.field_name.src,
		934	"no member named '{}' in '{}'",
		935	.{ field_name, elem_ty },
		936	);
		937	}
		938	},
		939	else => {},
		940	}
		941	},
		942	.Type => {
		943	_ = try mod.resolveConstValue(scope, object_ptr);
		944	const result = try mod.analyzeDeref(scope, fieldptr.base.src, object_ptr, object_ptr.src);
		945	const val = result.value().?;
		946	const child_type = try val.toType(scope.arena());
		947	switch (child_type.zigTypeTag()) {
		948	.ErrorSet => {
		949	// TODO resolve inferred error sets
		950	const entry = if (val.cast(Value.Payload.ErrorSet)) \|payload\|
		951	(payload.fields.getEntry(field_name) orelse
		952	return mod.fail(scope, fieldptr.base.src, "no error named '{}' in '{}'", .{ field_name, child_type })).*
		953	else try mod.getErrorValue(field_name);
		954
		955	const error_payload = try scope.arena().create(Value.Payload.Error);
		956	error_payload.* = .{
		957	.name = entry.key,
		958	.value = entry.value,
		959	};
		960
		961	const ref_payload = try scope.arena().create(Value.Payload.RefVal);
		962	ref_payload.* = .{ .val = Value.initPayload(&error_payload.base) };
		963
		964	const result_type = if (child_type.tag() == .anyerror) blk: {
		965	const result_payload = try scope.arena().create(Type.Payload.ErrorSetSingle);
		966	result_payload.* = .{ .name = entry.key };
		967	break :blk Type.initPayload(&result_payload.base);
		968	} else child_type;
		969
		970	return mod.constInst(scope, fieldptr.base.src, .{
		971	.ty = try mod.simplePtrType(scope, fieldptr.base.src, result_type, false, .One),
		972	.val = Value.initPayload(&ref_payload.base),
		973	});
		974	},
		975	else => return mod.fail(scope, fieldptr.base.src, "type '{}' does not support field access", .{child_type}),
		976	}
		977	},
		978	else => {},
862	}	979	}
		980	return mod.fail(scope, fieldptr.base.src, "type '{}' does not support field access", .{elem_ty});
863	}	981	}
864		982
865	fn analyzeInstIntCast(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {	983	fn analyzeInstIntCast(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {
...	@@ -983,6 +1101,10 @@ fn analyzeInstBitwise(mod: Module, scope: Scope, inst: *zir.Inst.BinOp) InnerE	...	@@ -983,6 +1101,10 @@ fn analyzeInstBitwise(mod: Module, scope: Scope, inst: *zir.Inst.BinOp) InnerE
983	return mod.fail(scope, inst.base.src, "TODO implement analyzeInstBitwise", .{});	1101	return mod.fail(scope, inst.base.src, "TODO implement analyzeInstBitwise", .{});
984	}	1102	}
985		1103
		1104	fn analyzeInstBitNot(mod: Module, scope: Scope, inst: zir.Inst.UnOp) InnerError!Inst {
		1105	return mod.fail(scope, inst.base.src, "TODO implement analyzeInstBitNot", .{});
		1106	}
		1107
986	fn analyzeInstArrayCat(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {	1108	fn analyzeInstArrayCat(mod: Module, scope: Scope, inst: zir.Inst.BinOp) InnerError!Inst {
987	return mod.fail(scope, inst.base.src, "TODO implement analyzeInstArrayCat", .{});	1109	return mod.fail(scope, inst.base.src, "TODO implement analyzeInstArrayCat", .{});
988	}	1110	}
...	@@ -1348,7 +1470,7 @@ fn analyzeInstPtrType(mod: Module, scope: Scope, inst: *zir.Inst.PtrType) Inne	...	@@ -1348,7 +1470,7 @@ fn analyzeInstPtrType(mod: Module, scope: Scope, inst: *zir.Inst.PtrType) Inne
1348		1470
1349	if (host_size != 0 and bit_offset >= host_size * 8)	1471	if (host_size != 0 and bit_offset >= host_size * 8)
1350	return mod.fail(scope, inst.base.src, "bit offset starts after end of host integer", .{});	1472	return mod.fail(scope, inst.base.src, "bit offset starts after end of host integer", .{});
1351		1473
1352	const sentinel = if (inst.kw_args.sentinel) \|some\|	1474	const sentinel = if (inst.kw_args.sentinel) \|some\|
1353	(try resolveInstConst(mod, scope, some)).val	1475	(try resolveInstConst(mod, scope, some)).val
1354	else	1476	else