Changes in src/GenPoly/InstantiateGeneric.cc [373d0b5:c20b0fea]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -476 +476 @@
                         DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
                         MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
+                        ResolvExpr::adjustExprType( ret->result ); // pointer decay
                         std::swap( ret->env, memberExpr->env );
                         delete memberExpr;
@@ -517 +518 @@
                                         Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ) );
                                         ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), new ReferenceType( Type::Qualifiers(), concType ), new SingleInit( init ) );
-                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, tmp ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
                                         return new VariableExpr( tmp );
                                 } else {