Changeset 4a3386b4 for src/InitTweak

Timestamp:

Jan 19, 2017, 2:56:51 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8f49a54

Parents:

765aa76 (diff), c2416d5 (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

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (1 diff)
• InitTweak.cc (modified) (3 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -84 +84 @@
                         // for library code are run before constructors and destructors for user code,
                         // specify a priority when building the library. Priorities 0-100 are reserved by gcc.
-                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
-                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
+                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
+                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
                 }
                 initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );

src/InitTweak/InitTweak.cc

@@ -327 +327 @@
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * > ( expr ) ) {
                                 return handleDerefCalledFunction( appExpr );
+                        } else if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
+                                return getCalledFunction( addrExpr->get_arg() );
                         }
                         return nullptr;
@@ -336 +338 @@
                 if ( ! appExpr ) return NULL;
                 DeclarationWithType * function = getCalledFunction( appExpr->get_function() );
-                assert( function );
+                assertf( function, "getCalledFunction returned nullptr: %s", toString( appExpr->get_function() ).c_str() );
                 // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
                 // will call all member dtors, and some members may have a user defined dtor.
@@ -386 +388 @@
                 } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( callExpr ) ) {
                         return callArg( untypedExpr, pos );
+                } else if ( TupleAssignExpr * tupleExpr = dynamic_cast< TupleAssignExpr * > ( callExpr ) ) {
+                        std::list< Statement * > & stmts = tupleExpr->get_stmtExpr()->get_statements()->get_kids();
+                        assertf( ! stmts.empty(), "TupleAssignExpr somehow has no statements." );
+                        ExprStmt * stmt = safe_dynamic_cast< ExprStmt * >( stmts.back() );
+                        TupleExpr * tuple = safe_dynamic_cast< TupleExpr * >( stmt->get_expr() );
+                        assertf( ! tuple->get_exprs().empty(), "TupleAssignExpr somehow has empty tuple expr." );
+                        return getCallArg( tuple->get_exprs().front(), pos );
                 } else {
-                        assertf( false, "Unexpected expression type passed to getCallArg" );
+                        assertf( false, "Unexpected expression type passed to getCallArg: %s", toString( callExpr ).c_str() );
                 }
         }