Changeset 02c816f for src/GenPoly/Box.cc

Timestamp:

Mar 7, 2018, 5:00:25 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, resolv-new, with_gc

Children:

661214c

Parents:

9bfc9da

Message:

Strip address-of from generic member-access expressions

File:

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

src/GenPoly/Box.cc

@@ -163 +163 @@
                         void premutate( DeclStmt *declStmt );
                         Expression *postmutate( MemberExpr *memberExpr );
+                        void premutate( AddressExpr *addrExpr );
+                        Expression *postmutate( AddressExpr *addrExpr );
                         Expression *postmutate( SizeofExpr *sizeofExpr );
                         Expression *postmutate( AlignofExpr *alignofExpr );
@@ -193 +195 @@
                         ScopedSet< std::string > knownOffsets;          ///< Set of non-generic types for which the offset array exists in the current scope, indexed by offsetofName
                         UniqueName bufNamer;                           ///< Namer for VLA buffers
+                        Expression * addrMember = nullptr;             ///< AddressExpr argument is MemberExpr?
                 };
 
@@ -1596 +1599 @@
                 }
 
+                void PolyGenericCalculator::premutate( AddressExpr * addrExpr ) {
+                        GuardValue( addrMember );
+                        // is the argument a MemberExpr before mutating?
+                        addrMember = dynamic_cast< MemberExpr * >( addrExpr->arg );
+                }
+
+                Expression * PolyGenericCalculator::postmutate( AddressExpr * addrExpr ) {
+                        if ( addrMember && addrMember != addrExpr->arg ) {
+                                // arg was a MemberExpr and has been mutated
+                                if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * >( addrExpr->arg ) ) {
+                                        if ( InitTweak::getFunctionName( untyped ) == "?+?" ) {
+                                                // MemberExpr was converted to pointer+offset, and it is not valid C to take the address of an addition, so strip the address-of
+                                                // TODO: should  addrExpr->arg->result be changed to addrExpr->result?
+                                                Expression * ret = addrExpr->arg;
+                                                addrExpr->arg = nullptr;
+                                                std::swap( addrExpr->env, ret->env );
+                                                delete addrExpr;
+                                                return ret;
+                                        }
+                                }
+                        }
+                        return addrExpr;
+                }
+
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
                         ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, nullptr, type, init );