From d1befe7123ef3282f16972215332954b801e15bd Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Tue, 27 Nov 2018 17:11:37 +0000 Subject: [PATCH] All tests pass again -- but this needs lots more tests please. --- src/sixtypical/analyzer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sixtypical/analyzer.py b/src/sixtypical/analyzer.py index edd067c..26dbbbb 100644 --- a/src/sixtypical/analyzer.py +++ b/src/sixtypical/analyzer.py @@ -816,7 +816,10 @@ class Analyzer(object): context._touched = set(context1._touched) | set(context2._touched) context.set_meaningful(*list(outgoing_meaningful)) context._writeable = set(context1._writeable) | set(context2._writeable) - context.encounter_gotos(context1.encountered_gotos() | context2.encountered_gotos()) + + # in both cases, we need to merge the encountered gotos, in order that + # fallthru optimization continues to work correctly. + context.encounter_gotos(context1.encountered_gotos() | context2.encountered_gotos()) for ref in outgoing_trashes: context.set_touched(ref)