Changeset 1a4323e

Timestamp:

Jun 6, 2019, 3:54:11 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

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:

• src/InitTweak/FixInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -288 +288 @@
                         static UniqueName dtorNamer( "__cleanup_dtor" );
                         std::string name = dtorNamer.newName();
-                        if(name == "__cleanup_dtor8") {
-                                objDecl->print(std::cerr);
-                                std::cerr << "-----" << std::endl;
-                                dtor->print(std::cerr);
-                        }
                         FunctionDecl * dtorFunc = FunctionDecl::newFunction( name, SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt() );
                         stmtsToAdd.push_back( new DeclStmt( dtorFunc ) );
@@ -308 +303 @@
                         size_t replaced = DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
                         if(replaced == 0) {
+                                objDecl->print(std::cerr);
+                                std::cerr << "-----" << std::endl;
+                                dtor->print(std::cerr);
                                 std::cerr << "Failed to replace " << objDecl << std::endl;
                                 abort();