From 657560d22b954317e5784d302145d72c29a9992c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 22 Jun 2017 13:57:50 +1000 Subject: [PATCH] Don't add "lhs == rhs" as a fact if impure. --- lang/ast/ast.go | 2 ++ lang/check/bounds.go | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 8f077b68..206d7e0f 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -202,6 +202,7 @@ const MaxExprDepth = 255 type Expr Node func (n *Expr) Node() *Node { return (*Node)(n) } +func (n *Expr) Pure() bool { return n.flags&FlagsImpure == 0 } func (n *Expr) Impure() bool { return n.flags&FlagsImpure != 0 } func (n *Expr) Suspendible() bool { return n.flags&FlagsSuspendible != 0 } func (n *Expr) CallImpure() bool { return n.flags&FlagsCallImpure != 0 } @@ -542,6 +543,7 @@ const MaxBodyDepth = 255 type Func Node func (n *Func) Node() *Node { return (*Node)(n) } +func (n *Func) Pure() bool { return n.flags&FlagsImpure == 0 } func (n *Func) Impure() bool { return n.flags&FlagsImpure != 0 } func (n *Func) Suspendible() bool { return n.flags&FlagsSuspendible != 0 } func (n *Func) Public() bool { return n.flags&FlagsPublic != 0 } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index e93b82c0..fa9d3626 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -273,9 +273,11 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { return x }) - o := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryEqEq, 0, lhs.Node(), nil, rhs.Node(), nil) - o.SetMType(lhs.MType()) - q.facts.appendFact(o) + if lhs.Pure() && rhs.Pure() { + o := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryEqEq, 0, lhs.Node(), nil, rhs.Node(), nil) + o.SetMType(lhs.MType()) + q.facts.appendFact(o) + } } else { // Update any facts involving lhs. q.facts.update(func(x *a.Expr) *a.Expr {