Changeset 8c0d801 for src/InitTweak

Timestamp:

Jun 6, 2019, 3:40:56 PM (7 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:

1a4323e

Parents:

b7d92b96 (diff), 546e712 (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) (3 diffs)

src/InitTweak/FixInit.cc

@@ -262 +262 @@
                         // unwrap implicit statement wrapper
                         Statement * dtor = input;
-                        if ( ImplicitCtorDtorStmt * implicit = dynamic_cast< ImplicitCtorDtorStmt * >( input ) ) {
-                                // dtor = implicit->callStmt;
-                                // implicit->callStmt = nullptr;
-                        }
                         assert( dtor );
                         std::list< Expression * > matches;
@@ -291 +287 @@
                         // wraps the more complicated code.
                         static UniqueName dtorNamer( "__cleanup_dtor" );
-                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt() );
+                        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 ) );
 
@@ -304 +306 @@
                                 replacement = new CastExpr( replacement, base->clone() );
                         }
-                        DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
+                        size_t replaced = DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
+                        if(replaced == 0) {
+                                std::cerr << "Failed to replace " << objDecl << std::endl;
+                                abort();
+                        }
                         dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) );