Changeset 10e81ac for src/InitTweak/FixInit.cc

Timestamp:

May 27, 2016, 4:16:53 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

725f36f5

Parents:

aad5a48 (diff), 677c1be (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

@@ -131 +131 @@
                                 // optimization: don't need to copy construct in order to call intrinsic functions
                                 return appExpr;
-                        } else if ( FunctionDecl * funcDecl = dynamic_cast< FunctionDecl * > ( function->get_var() ) ) {
-                                FunctionType * ftype = funcDecl->get_functionType();
+                        } else if ( DeclarationWithType * funcDecl = dynamic_cast< DeclarationWithType * > ( function->get_var() ) ) {
+                                // FunctionType * ftype = funcDecl->get_functionType();
+                                FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
+                                assert( ftype );
                                 if ( (funcDecl->get_name() == "?{}" || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
                                         Type * t1 = ftype->get_parameters().front()->get_type();
@@ -138 +140 @@
                                         PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
                                         assert( ptrType );
+
                                         if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
                                                 // optimization: don't need to copy construct in order to call a copy constructor or