Changes in / [5684736:9151fcb]

Location:

src

Files:

• AST/Convert.cpp (modified) (5 diffs)
• GenPoly/Lvalue.cc (modified) (1 diff)

src/AST/Convert.cpp

@@ -735 +735 @@
                 expr->var = get<DeclarationWithType>().accept1(node->var);
                 Type * type = expr->var->get_type()->clone();
+                if(FunctionType * ft = dynamic_cast<FunctionType*>(type)) {
+                        if(node->result.as<ast::PointerType>()) {
+                                type = new PointerType({}, ft);
+                        }
+                }
+
                 type->set_lvalue( true );
-                expr->set_result( type );
+                expr->result = type ;
                 this->node = expr;
                 return nullptr;
@@ -782 +788 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new SizeofExpr(
                                 get<Type>().accept1(node->type)
@@ -803 +810 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new AlignofExpr(
                                 get<Type>().accept1(node->type)
@@ -2149 +2157 @@
                 );
 
-                visitBaseExpr( old,
+                visitBaseExpr_SkipResultType( old,
                         expr
                 );
@@ -2155 +2163 @@
                 expr->var = GET_ACCEPT_1(var, DeclWithType);
                 expr->result = expr->var->get_type();
+                if(const ast::FunctionType * ft = expr->result.as<ast::FunctionType>()) {
+                        if(dynamic_cast<PointerType *>(old->result)) {
+                                expr->result = new ast::PointerType(ft);
+                        }
+                }
                 add_qualifiers( expr->result, ast::CV::Lvalue );
                 this->node = expr;

src/GenPoly/Lvalue.cc

@@ -196 +196 @@
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->parameters.size();
+
+                                /// The for loop may eagerly dereference the iterators and fail on empty lists
+                                if(i == end) { return appExpr; }
                                 for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
                                         if (i == end) break;