Changeset daefe93


Ignore:
Timestamp:
Nov 3, 2020, 1:43:42 PM (13 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Pass.impl.hpp

    rdbb1073 rdaefe93  
    674674const ast::CompoundStmt * ast::Pass< core_t >::visit( const ast::CompoundStmt * node ) {
    675675        VISIT_START( node );
    676         VISIT({
     676        VISIT(
    677677                // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
    678678                auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
     
    681681                        if ( leaveScope ) __pass::symtab::leave(core, 0);
    682682                });
    683                 ValueGuard< bool > guard2( inFunction );
     683                ValueGuard< bool > guard2( atFunctionTop );
     684                atFunctionTop = false;
    684685                guard_scope guard3 { *this };
    685                 inFunction = false;
    686686                maybe_accept( node, &CompoundStmt::kids );
    687         })
     687        )
    688688        VISIT_END( CompoundStmt, node );
    689689}
Note: See TracChangeset for help on using the changeset viewer.