Changes in / [b4d65c7:fe26fbf]

Location:

src

Files:

• GenPoly/Box.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Mangler.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -1307 +1307 @@
                                 }
                         }
+                        // errors should have been caught by this point, remove initializers from parameters to allow correct codegen of default arguments
+                        for ( Declaration * param : functionDecl->get_functionType()->get_parameters() ) {
+                                if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( param ) ) {
+                                        delete obj->get_init();
+                                        obj->set_init( nullptr );
+                                }
+                        }
                         return functionDecl;
                 }

src/ResolvExpr/AlternativeFinder.cc

@@ -403 +403 @@
                         // End of actuals - Handle default values
                         if ( SingleInit *si = dynamic_cast<SingleInit *>( defaultValue )) {
-                                // so far, only constant expressions are accepted as default values
-                                if ( ConstantExpr *cnstexpr = dynamic_cast<ConstantExpr *>( si->get_value()) ) {
-                                        if ( Constant *cnst = dynamic_cast<Constant *>( cnstexpr->get_constant() ) ) {
-                                                if ( unify( formalType, cnst->get_type(), resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
-                                                        // xxx - Don't know if this is right
-                                                        *out++ = cnstexpr->clone();
-                                                        return true;
+                                if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( si->get_value() ) ) {
+                                        // so far, only constant expressions are accepted as default values
+                                        if ( ConstantExpr *cnstexpr = dynamic_cast<ConstantExpr *>( castExpr->get_arg() ) ) {
+                                                if ( Constant *cnst = dynamic_cast<Constant *>( cnstexpr->get_constant() ) ) {
+                                                        if ( unify( formalType, cnst->get_type(), resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
+                                                                *out++ = cnstexpr->clone();
+                                                                return true;
+                                                        } // if
                                                 } // if
                                         } // if
-                                } // if
+                                }
                         } // if
                         return false;

src/SymTab/Mangler.cc

@@ -172 +172 @@
                         for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                 TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                assert(paramType && "Aggregate parameters should be type expressions");
+                                assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
                                 maybeAccept( paramType->get_type(), *this );
                         }

src/SymTab/Validate.cc

@@ -696 +696 @@
                         FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
                         objDecl->get_attributes().clear();
+                        objDecl->set_type( nullptr );
                         delete objDecl;
                         return newDecl;