Changeset b7fd9daf for src/main.cc


Ignore:
Timestamp:
Nov 10, 2021, 7:47:45 PM (9 months ago)
Author:
Fangren Yu <f37yu@…>
Branches:
enum, forall-pointer-decay, master, pthread-emulation
Children:
3249dd8
Parents:
1622af5 (diff), f95634e (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 'new-ast-unique-expr'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/main.cc

    r1622af5 rb7fd9daf  
    381381                        PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
    382382
     383                        // fix ObjectDecl - replaces ConstructorInit nodes
     384                        if ( ctorinitp ) {
     385                                dump( move( transUnit ) );
     386                                return EXIT_SUCCESS;
     387                        } // if
     388
     389                        // Currently not working due to unresolved issues with UniqueExpr
     390                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
    383391                        translationUnit = convert( move( transUnit ) );
    384392                } else {
     
    435443
    436444                        PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
     445
     446                        // fix ObjectDecl - replaces ConstructorInit nodes
     447                        if ( ctorinitp ) {
     448                                dump ( translationUnit );
     449                                return EXIT_SUCCESS;
     450                        } // if
     451
     452                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
    437453                }
    438 
    439                 // fix ObjectDecl - replaces ConstructorInit nodes
    440                 if ( ctorinitp ) {
    441                         dump ( translationUnit );
    442                         return EXIT_SUCCESS;
    443                 } // if
    444 
    445                 PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
    446454
    447455                PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
Note: See TracChangeset for help on using the changeset viewer.