Changeset 90152a4 for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -24 +24 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for deleteAll, cloneAll
@@ -476 +475 @@
                         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;
@@ -496 +496 @@
         Expression * FixDtypeStatic::fixMemberExpr( AggrInst * inst, MemberExpr * memberExpr ) {
                 // need to cast dtype-static member expressions to their actual type before that type is erased.
+                // NOTE: the casts here have the third argument (isGenerated) set to false so that these casts persist until Box, where they are needed.
                 auto & baseParams = *inst->get_baseParameters();
                 if ( isDtypeStatic( baseParams ) ) {
@@ -515 +516 @@
                                         // Note: this currently creates more temporaries than is strictly necessary, since it does not check for duplicate uses of the same member expression.
                                         static UniqueName tmpNamer( "_dtype_static_member_" );
-                                        Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ) );
+                                        Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ), false );
                                         ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), new ReferenceType( Type::Qualifiers(), concType ), new SingleInit( init ) );
                                         stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
@@ -521 +522 @@
                                 } else {
                                         // can simply add a cast to actual type
-                                        return new CastExpr( memberExpr, concType );
+                                        return new CastExpr( memberExpr, concType, false );
                                 }
                         }