Changeset 27aca84

Timestamp:

Apr 17, 2018, 4:25:10 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

70a5acf

Parents:

c0bf94e

Message:

Mark dtype-static casts as non-generated so they persist until Box

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -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 );
                                 }
                         }