Changeset daefe93

Timestamp:

Nov 3, 2020, 1:43:42 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

293dc1c, 3c80ccc, a2f2fda

Parents:

dbb1073 (diff), 82f791f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Pass.impl.hpp (modified) (2 diffs)

src/AST/Pass.impl.hpp

@@ -674 +674 @@
 const ast::CompoundStmt * ast::Pass< core_t >::visit( const ast::CompoundStmt * node ) {
         VISIT_START( node );
-        VISIT({
+        VISIT(
                 // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
                 auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
@@ -681 +681 @@
                         if ( leaveScope ) __pass::symtab::leave(core, 0);
                 });
-                ValueGuard< bool > guard2( inFunction );
+                ValueGuard< bool > guard2( atFunctionTop );
+                atFunctionTop = false;
                 guard_scope guard3 { *this };
-                inFunction = false;
                 maybe_accept( node, &CompoundStmt::kids );
-        })
+        )
         VISIT_END( CompoundStmt, node );
 }