Changeset 1a4323e


Ignore:
Timestamp:
Jun 6, 2019, 3:54:11 PM (2 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
2b59f55
Parents:
8c0d801 (diff), f46bfd2f (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/InitTweak/FixInit.cc

    r8c0d801 r1a4323e  
    288288                        static UniqueName dtorNamer( "__cleanup_dtor" );
    289289                        std::string name = dtorNamer.newName();
    290                         if(name == "__cleanup_dtor8") {
    291                                 objDecl->print(std::cerr);
    292                                 std::cerr << "-----" << std::endl;
    293                                 dtor->print(std::cerr);
    294                         }
    295290                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( name, SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt() );
    296291                        stmtsToAdd.push_back( new DeclStmt( dtorFunc ) );
     
    308303                        size_t replaced = DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
    309304                        if(replaced == 0) {
     305                                objDecl->print(std::cerr);
     306                                std::cerr << "-----" << std::endl;
     307                                dtor->print(std::cerr);
    310308                                std::cerr << "Failed to replace " << objDecl << std::endl;
    311309                                abort();
Note: See TracChangeset for help on using the changeset viewer.