From fd071dfc905f15d48bd8146e264d938102e38f9d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 18 Feb 2021 14:13:53 +1100 Subject: [PATCH] Ban cpu_arch types from fields and func args/rets --- lang/check/check.go | 21 ++++++++++++++++++--- lang/check/resolve.go | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lang/check/check.go b/lang/check/check.go index 84dc12da..f549d1ce 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -475,7 +475,7 @@ func (c *Checker) checkStructCycles(_ *a.Node) error { func (c *Checker) checkStructFields(node *a.Node) error { n := node.AsStruct() - if err := c.checkFields(n.Fields(), true, true); err != nil { + if err := c.checkFields(n.Fields(), true, true, true); err != nil { return &Error{ Err: fmt.Errorf("%v in struct %s", err, n.QID().Str(c.tm)), Filename: n.Filename(), @@ -485,7 +485,7 @@ func (c *Checker) checkStructFields(node *a.Node) error { return nil } -func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool, checkDefaultZeroValue bool) error { +func (c *Checker) checkFields(fields []*a.Node, banCPUArchTypes bool, banPtrTypes bool, checkDefaultZeroValue bool) error { if len(fields) == 0 { return nil } @@ -503,6 +503,10 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool, checkDefaultZe if err := checkTypeExpr(q, f.XType()); err != nil { return fmt.Errorf("%v for field %q", err, f.Name().Str(c.tm)) } + if banCPUArchTypes && f.XType().Innermost().IsCPUArchType() { + return fmt.Errorf("check: cpu_arch type %q not allowed for field %q", + f.XType().Str(c.tm), f.Name().Str(c.tm)) + } if banPtrTypes && f.XType().HasPointers() { return fmt.Errorf("check: pointer-containing type %q not allowed for field %q", f.XType().Str(c.tm), f.Name().Str(c.tm)) @@ -534,14 +538,25 @@ func checkTypeExpr(q *checker, n *a.TypeExpr) error { } func (c *Checker) checkFuncSignature(node *a.Node) error { + return c.checkFuncSignature1(node, true) +} + +func (c *Checker) checkFuncSignature1(node *a.Node, banCPUArchTypes bool) error { n := node.AsFunc() - if err := c.checkFields(n.In().Fields(), false, false); err != nil { + if err := c.checkFields(n.In().Fields(), banCPUArchTypes, false, false); err != nil { return &Error{ Err: fmt.Errorf("%v in in-params for func %s", err, n.QQID().Str(c.tm)), Filename: n.Filename(), Line: n.Line(), } } + if banCPUArchTypes && (n.Out() != nil) && n.Out().Innermost().IsCPUArchType() { + return &Error{ + Err: fmt.Errorf("check: cpu_arch type %q not allowed as return type", n.Out().Str(c.tm)), + Filename: n.Filename(), + Line: n.Line(), + } + } setPlaceholderMBoundsMType(n.In().AsNode()) if out := n.Out(); out != nil { if n.Effect().Coroutine() && n.Receiver()[0] != t.IDBase { diff --git a/lang/check/resolve.go b/lang/check/resolve.go index ae672292..6e167bc3 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -136,7 +136,7 @@ var builtInTypeMap = typeMap{ func (c *Checker) parseBuiltInFuncs(m map[t.QQID]*a.Func, ss []string) error { return builtin.ParseFuncs(c.tm, ss, func(f *a.Func) error { - if err := c.checkFuncSignature(f.AsNode()); err != nil { + if err := c.checkFuncSignature1(f.AsNode(), false); err != nil { return err } if m != nil {