Changeset 0f79853

Timestamp:

Jun 7, 2018, 9:55:28 AM (5 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:

61d9b4b

Parents:

2a6c115

Message:

Remove conversion cost for default arguments

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• Common/PassVisitor.h (modified) (2 diffs)
• Common/PassVisitor.impl.h (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Visitor.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -836 +836 @@
                 assertf( ! genC, "Deleted expressions should not reach code generation." );
                 expr->expr->accept( *visitor );
+        }
+
+        void CodeGenerator::postvisit( DefaultArgExpr * arg ) {
+                assertf( ! genC, "Default argument expressions should not reach code generation." );
+                arg->expr->accept( *visitor );
         }
 

src/CodeGen/CodeGenerator.h

@@ -94 +94 @@
                 void postvisit( ConstructorExpr * );
                 void postvisit( DeletedExpr * );
+                void postvisit( DefaultArgExpr * );
                 void postvisit( GenericExpr * );
 

src/Common/PassVisitor.h

@@ -125 +125 @@
         virtual void visit( InitExpr *  initExpr ) override final;
         virtual void visit( DeletedExpr *  delExpr ) override final;
+        virtual void visit( DefaultArgExpr * argExpr ) override final;
         virtual void visit( GenericExpr * genExpr ) override final;
 
@@ -224 +225 @@
         virtual Expression * mutate( InitExpr *  initExpr ) override final;
         virtual Expression * mutate( DeletedExpr *  delExpr ) override final;
+        virtual Expression * mutate( DefaultArgExpr * argExpr ) override final;
         virtual Expression * mutate( GenericExpr * genExpr ) override final;
 

src/Common/PassVisitor.impl.h

@@ -2084 +2084 @@
 
 //--------------------------------------------------------------------------
+// DefaultArgExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DefaultArgExpr * node ) {
+        VISIT_START( node );
+
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->expr, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::mutate( DefaultArgExpr * node ) {
+        MUTATE_START( node );
+
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->expr, *this );
+
+        MUTATE_END( Expression, node );
+}
+
+//--------------------------------------------------------------------------
 // GenericExpr
 template< typename pass_type >

src/ResolvExpr/AlternativeFinder.cc

@@ -437 +437 @@
                                 }
                         }
+                        if ( DefaultArgExpr * def = dynamic_cast< DefaultArgExpr * >( *actualExpr ) ) {
+                                // default arguments should be free - don't include conversion cost.
+                                // Unwrap them here because they are not relevant to the rest of the system.
+                                *actualExpr = def->expr;
+                                ++formal;
+                                continue;
+                        }
                         Type * formalType = (*formal)->get_type();
                         convCost += computeExpressionConversionCost( *actualExpr, formalType, indexer, alt.env );
@@ -872 +879 @@
                                                                 indexer ) ) {
                                                         results.emplace_back(
-                                                                i, cnstExpr, move(env), move(need), move(have),
+                                                                i, new DefaultArgExpr( cnstExpr ), move(env), move(need), move(have),
                                                                 move(openVars), nextArg, nTuples );
                                                 }

src/SynTree/Expression.cc

@@ -746 +746 @@
         os << std::endl << indent+1 << "... deleted by: ";
         deleteStmt->print( os, indent+1 );
+}
+
+
+DefaultArgExpr::DefaultArgExpr( Expression * expr ) : expr( expr ) {
+        assert( expr->result );
+        result = expr->result->clone();
+}
+DefaultArgExpr::DefaultArgExpr( const DefaultArgExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ) {}
+DefaultArgExpr::~DefaultArgExpr() {
+        delete expr;
+}
+
+void DefaultArgExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Default Argument Expression" << std::endl << indent+1;
+        expr->print( os, indent+1 );
 }
 

src/SynTree/Expression.h

@@ -865 +865 @@
 };
 
+/// expression wrapping the use of a default argument - should never make it past the resolver.
+class DefaultArgExpr : public Expression {
+public:
+        Expression * expr;
+
+        DefaultArgExpr( Expression * expr );
+        DefaultArgExpr( const DefaultArgExpr & other );
+        ~DefaultArgExpr();
+
+        virtual DefaultArgExpr * clone() const { return new DefaultArgExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+};
+
 /// C11 _Generic expression
 class GenericExpr : public Expression {

src/SynTree/Mutator.h

@@ -93 +93 @@
         virtual Expression * mutate( InitExpr  * initExpr ) = 0;
         virtual Expression * mutate( DeletedExpr * delExpr ) = 0;
+        virtual Expression * mutate( DefaultArgExpr * argExpr ) = 0;
         virtual Expression * mutate( GenericExpr * genExpr ) = 0;
 

src/SynTree/SynTree.h

@@ -101 +101 @@
 class InitExpr;
 class DeletedExpr;
+class DefaultArgExpr;
 class GenericExpr;
 

src/SynTree/Visitor.h

@@ -95 +95 @@
         virtual void visit( InitExpr *  initExpr ) = 0;
         virtual void visit( DeletedExpr * delExpr ) = 0;
+        virtual void visit( DefaultArgExpr * argExpr ) = 0;
         virtual void visit( GenericExpr * genExpr ) = 0;