Changeset c20b0fea

Timestamp:

Feb 2, 2018, 3:46:29 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:

11b7028

Parents:

20cba76

Message:

Perform pointer decay on instantiated generic member expressions [fixes #78]

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• ResolvExpr/AdjustExprType.cc (modified) (3 diffs)
• ResolvExpr/typeops.h (modified) (1 diff)

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;

src/ResolvExpr/AdjustExprType.cc

@@ -24 +24 @@
         class AdjustExprType : public WithShortCircuiting {
           public:
-                AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                AdjustExprType( const TypeEnvironment & env, const SymTab::Indexer & indexer );
                 void premutate( VoidType * ) { visit_children = false; }
                 void premutate( BasicType * ) { visit_children = false; }
@@ -45 +45 @@
 
           private:
-                const TypeEnvironment &env;
-                const SymTab::Indexer &indexer;
+                const TypeEnvironment & env;
+                const SymTab::Indexer & indexer;
         };
 
@@ -53 +53 @@
                 Type *newType = type->acceptMutator( adjuster );
                 type = newType;
+        }
+
+        void adjustExprType( Type *& type ) {
+                TypeEnvironment env;
+                SymTab::Indexer indexer;
+                adjustExprType( type, env, indexer );
         }
 

src/ResolvExpr/typeops.h

@@ -55 +55 @@
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
         void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+
+        /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function using empty TypeEnvironment and Indexer
+        void adjustExprType( Type *& type );
 
         template< typename ForwardIterator >