From 052b897ff963e84cb5f7d41649b6e5f2a74b3268 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Fri, 8 Mar 2024 17:24:27 +0100 Subject: Revert "prog: auto-set proper conditional fields in Deserialize()" This reverts commit 8e75c913b6f9b09cab2ad31fd7d66ea0d1703de8. --- prog/encoding.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'prog/encoding.go') diff --git a/prog/encoding.go b/prog/encoding.go index e925e7918..b5d5114ca 100644 --- a/prog/encoding.go +++ b/prog/encoding.go @@ -257,13 +257,9 @@ func (target *Target) Deserialize(data []byte, mode DeserializeMode) (*Prog, err // This validation is done even in non-debug mode because deserialization // procedure does not catch all bugs (e.g. mismatched types). // And we can receive bad programs from corpus and hub. - if err := prog.validateWithOpts(validationOptions{ - // Don't validate auto-set conditional fields. We'll patch them later. - ignoreTransient: true, - }); err != nil { + if err := prog.validate(); err != nil { return nil, err } - p.fixupConditionals(prog) if p.autos != nil { p.fixupAutos(prog) } @@ -1158,13 +1154,6 @@ func (p *parser) fixupAutos(prog *Prog) { } } -func (p *parser) fixupConditionals(prog *Prog) { - for _, c := range prog.Calls { - // Only overwrite transient union fields. - c.setDefaultConditions(p.target, true) - } -} - func (p *parser) Scan() bool { if p.e != nil || len(p.data) == 0 { return false -- cgit mrf-deployment