authorgravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-08-30 19:02:23-06:00
committergravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-08-30 19:02:23-06:00
loga2c47d2b0b0475b15a81067bf5d764ce6ae609b3
tree3e7b786b084b86dfebafb69b20a8beb89856ada6
parent1bb30c5e228f4a5ebc42cc23e593ebad3bd6dbbe
signature Commit is signed but in an unrecognized format.

Remove @OpaqueType

6 files changed, 1 insertions(+), 47 deletions(-)

src/all_types.hpp-6
......@@ -1809,7 +1809,6 @@ enum BuiltinFnId {
18091809 BuiltinFnIdShrExact,
18101810 BuiltinFnIdSetEvalBranchQuota,
18111811 BuiltinFnIdAlignCast,
1812 BuiltinFnIdOpaqueType,
18131812 BuiltinFnIdThis,
18141813 BuiltinFnIdSetAlignStack,
18151814 BuiltinFnIdExport,
......@@ -2734,7 +2733,6 @@ enum IrInstSrcId {
27342733 IrInstSrcIdImplicitCast,
27352734 IrInstSrcIdResolveResult,
27362735 IrInstSrcIdResetResult,
2737 IrInstSrcIdOpaqueType,
27382736 IrInstSrcIdSetAlignStack,
27392737 IrInstSrcIdArgType,
27402738 IrInstSrcIdExport,
......@@ -4234,10 +4232,6 @@ struct IrInstGenAlignCast {
42344232 IrInstGen *target;
42354233};
42364234
4237struct IrInstSrcOpaqueType {
4238 IrInstSrc base;
4239};
4240
42414235struct IrInstSrcSetAlignStack {
42424236 IrInstSrc base;
42434237
src/codegen.cpp-1
......@@ -8699,7 +8699,6 @@ static void define_builtin_fns(CodeGen *g) {
86998699 create_builtin_fn(g, BuiltinFnIdShrExact, "shrExact", 2);
87008700 create_builtin_fn(g, BuiltinFnIdSetEvalBranchQuota, "setEvalBranchQuota", 1);
87018701 create_builtin_fn(g, BuiltinFnIdAlignCast, "alignCast", 2);
8702 create_builtin_fn(g, BuiltinFnIdOpaqueType, "OpaqueType", 0);
87038702 create_builtin_fn(g, BuiltinFnIdSetAlignStack, "setAlignStack", 1);
87048703 create_builtin_fn(g, BuiltinFnIdExport, "export", 2);
87058704 create_builtin_fn(g, BuiltinFnIdErrorReturnTrace, "errorReturnTrace", 0);
src/ir.cpp-29
......@@ -505,8 +505,6 @@ static void destroy_instruction_src(IrInstSrc *inst) {
505505 return heap::c_allocator.destroy(reinterpret_cast<IrInstSrcResolveResult *>(inst));
506506 case IrInstSrcIdResetResult:
507507 return heap::c_allocator.destroy(reinterpret_cast<IrInstSrcResetResult *>(inst));
508 case IrInstSrcIdOpaqueType:
509 return heap::c_allocator.destroy(reinterpret_cast<IrInstSrcOpaqueType *>(inst));
510508 case IrInstSrcIdSetAlignStack:
511509 return heap::c_allocator.destroy(reinterpret_cast<IrInstSrcSetAlignStack *>(inst));
512510 case IrInstSrcIdArgType:
......@@ -1532,10 +1530,6 @@ static constexpr IrInstSrcId ir_inst_id(IrInstSrcResetResult *) {
15321530 return IrInstSrcIdResetResult;
15331531}
15341532
1535static constexpr IrInstSrcId ir_inst_id(IrInstSrcOpaqueType *) {
1536 return IrInstSrcIdOpaqueType;
1537}
1538
15391533static constexpr IrInstSrcId ir_inst_id(IrInstSrcSetAlignStack *) {
15401534 return IrInstSrcIdSetAlignStack;
15411535}
......@@ -4535,12 +4529,6 @@ static IrInstSrc *ir_build_reset_result(IrBuilderSrc *irb, Scope *scope, AstNode
45354529 return &instruction->base;
45364530}
45374531
4538static IrInstSrc *ir_build_opaque_type(IrBuilderSrc *irb, Scope *scope, AstNode *source_node) {
4539 IrInstSrcOpaqueType *instruction = ir_build_instruction<IrInstSrcOpaqueType>(irb, scope, source_node);
4540
4541 return &instruction->base;
4542}
4543
45444532static IrInstSrc *ir_build_set_align_stack(IrBuilderSrc *irb, Scope *scope, AstNode *source_node,
45454533 IrInstSrc *align_bytes)
45464534{
......@@ -7310,11 +7298,6 @@ static IrInstSrc *ir_gen_builtin_fn_call(IrBuilderSrc *irb, Scope *scope, AstNod
73107298 IrInstSrc *align_cast = ir_build_align_cast_src(irb, scope, node, arg0_value, arg1_value);
73117299 return ir_lval_wrap(irb, scope, align_cast, lval, result_loc);
73127300 }
7313 case BuiltinFnIdOpaqueType:
7314 {
7315 IrInstSrc *opaque_type = ir_build_opaque_type(irb, scope, node);
7316 return ir_lval_wrap(irb, scope, opaque_type, lval, result_loc);
7317 }
73187301 case BuiltinFnIdThis:
73197302 {
73207303 IrInstSrc *this_inst = ir_gen_this(irb, scope, node);
......@@ -30263,15 +30246,6 @@ static IrInstGen *ir_analyze_instruction_align_cast(IrAnalyze *ira, IrInstSrcAli
3026330246 return result;
3026430247}
3026530248
30266static IrInstGen *ir_analyze_instruction_opaque_type(IrAnalyze *ira, IrInstSrcOpaqueType *instruction) {
30267 Buf *bare_name = buf_alloc();
30268 Buf *full_name = get_anon_type_name(ira->codegen, ira->old_irb.exec, "opaque",
30269 instruction->base.base.scope, instruction->base.base.source_node, bare_name);
30270 ZigType *result_type = get_opaque_type(ira->codegen, instruction->base.base.scope,
30271 instruction->base.base.source_node, buf_ptr(full_name), bare_name);
30272 return ir_const_type(ira, &instruction->base.base, result_type);
30273}
30274
3027530249static IrInstGen *ir_analyze_instruction_set_align_stack(IrAnalyze *ira, IrInstSrcSetAlignStack *instruction) {
3027630250 uint32_t align_bytes;
3027730251 IrInstGen *align_bytes_inst = instruction->align_bytes->child;
......@@ -31736,8 +31710,6 @@ static IrInstGen *ir_analyze_instruction_base(IrAnalyze *ira, IrInstSrc *instruc
3173631710 return ir_analyze_instruction_resolve_result(ira, (IrInstSrcResolveResult *)instruction);
3173731711 case IrInstSrcIdResetResult:
3173831712 return ir_analyze_instruction_reset_result(ira, (IrInstSrcResetResult *)instruction);
31739 case IrInstSrcIdOpaqueType:
31740 return ir_analyze_instruction_opaque_type(ira, (IrInstSrcOpaqueType *)instruction);
3174131713 case IrInstSrcIdSetAlignStack:
3174231714 return ir_analyze_instruction_set_align_stack(ira, (IrInstSrcSetAlignStack *)instruction);
3174331715 case IrInstSrcIdArgType:
......@@ -32181,7 +32153,6 @@ bool ir_inst_src_has_side_effects(IrInstSrc *instruction) {
3218132153 case IrInstSrcIdAlignCast:
3218232154 case IrInstSrcIdImplicitCast:
3218332155 case IrInstSrcIdResolveResult:
32184 case IrInstSrcIdOpaqueType:
3218532156 case IrInstSrcIdArgType:
3218632157 case IrInstSrcIdTagType:
3218732158 case IrInstSrcIdErrorReturnTrace:
src/ir_print.cpp-9
......@@ -306,8 +306,6 @@ const char* ir_inst_src_type_str(IrInstSrcId id) {
306306 return "SrcResolveResult";
307307 case IrInstSrcIdResetResult:
308308 return "SrcResetResult";
309 case IrInstSrcIdOpaqueType:
310 return "SrcOpaqueType";
311309 case IrInstSrcIdSetAlignStack:
312310 return "SrcSetAlignStack";
313311 case IrInstSrcIdArgType:
......@@ -2315,10 +2313,6 @@ static void ir_print_reset_result(IrPrintSrc *irp, IrInstSrcResetResult *instruc
23152313 fprintf(irp->f, ")");
23162314}
23172315
2318static void ir_print_opaque_type(IrPrintSrc *irp, IrInstSrcOpaqueType *instruction) {
2319 fprintf(irp->f, "@OpaqueType()");
2320}
2321
23222316static void ir_print_set_align_stack(IrPrintSrc *irp, IrInstSrcSetAlignStack *instruction) {
23232317 fprintf(irp->f, "@setAlignStack(");
23242318 ir_print_other_inst_src(irp, instruction->align_bytes);
......@@ -2911,9 +2905,6 @@ static void ir_print_inst_src(IrPrintSrc *irp, IrInstSrc *instruction, bool trai
29112905 case IrInstSrcIdResetResult:
29122906 ir_print_reset_result(irp, (IrInstSrcResetResult *)instruction);
29132907 break;
2914 case IrInstSrcIdOpaqueType:
2915 ir_print_opaque_type(irp, (IrInstSrcOpaqueType *)instruction);
2916 break;
29172908 case IrInstSrcIdSetAlignStack:
29182909 ir_print_set_align_stack(irp, (IrInstSrcSetAlignStack *)instruction);
29192910 break;
test/compile_errors.zig+1-1
......@@ -7394,7 +7394,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
73947394 });
73957395
73967396 cases.add("function parameter is opaque",
7397 \\const FooType = @OpaqueType();
7397 \\const FooType = @Type(.Opaque);
73987398 \\export fn entry1() void {
73997399 \\ const someFuncPtr: fn (FooType) void = undefined;
74007400 \\}
test/stage1/behavior/type.zig-1
......@@ -190,7 +190,6 @@ test "Type.ErrorUnion" {
190190}
191191
192192test "Type.Opaque" {
193 testing.expect(@OpaqueType() != @Type(.Opaque));
194193 testing.expect(@Type(.Opaque) != @Type(.Opaque));
195194 testing.expect(@typeInfo(@Type(.Opaque)) == .Opaque);
196195}