Changeset b067d9b for src/GenPoly/Box.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/GenPoly/Box.cc

@@ -76 +76 @@
 
                 /// Replaces polymorphic return types with out-parameters, replaces calls to polymorphic functions with adapter calls as needed, and adds appropriate type variables to the function call
-                class Pass1 final : public BoxPass, public WithTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
+                class Pass1 final : public BoxPass, public WithConstTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
                   public:
                         Pass1();
@@ -150 +150 @@
                 /// * Calculates polymorphic offsetof expressions from offset array
                 /// * Inserts dynamic calculation of polymorphic type layouts where needed
-                class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithTypeSubstitution {
+                class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithConstTypeSubstitution {
                 public:
                         PolyGenericCalculator();
@@ -657 +657 @@
                                 paramExpr = new AddressExpr( paramExpr );
                         } // if
-                        arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
+                        arg = appExpr->args.insert( arg, paramExpr ); // add argument to function call
                         arg++;
                         // Build a comma expression to call the function and emulate a normal return.
                         CommaExpr *commaExpr = new CommaExpr( appExpr, retExpr );
-                        commaExpr->set_env( appExpr->get_env() );
-                        appExpr->set_env( 0 );
+                        commaExpr->env = appExpr->env;
+                        appExpr->env = nullptr;
                         return commaExpr;
                 }
@@ -708 +708 @@
 //                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                         if ( isDynRet( function, tyVars ) ) {
-                                ret = addRetParam( appExpr, function->get_returnVals().front()->get_type(), arg );
+                                ret = addRetParam( appExpr, function->returnVals.front()->get_type(), arg );
                         } // if
                         std::string mangleName = mangleAdapterName( function, tyVars );
@@ -715 +715 @@
                         // cast adaptee to void (*)(), since it may have any type inside a polymorphic function
                         Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
-                        appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
+                        appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
                         appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
 
@@ -725 +725 @@
                         if ( ! needsBoxing( param, arg->result, exprTyVars, env ) ) return;
 
-                        if ( arg->result->get_lvalue() ) {
+                        if ( arg->get_lvalue() ) {
                                 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
                                 // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {
@@ -798 +798 @@
                         for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) {
                                 for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->assertions.begin(); assert != (*tyVar)->assertions.end(); ++assert ) {
-                                        InferredParams::const_iterator inferParam = appExpr->get_inferParams().find( (*assert)->get_uniqueId() );
-                                        assertf( inferParam != appExpr->get_inferParams().end(), "addInferredParams missing inferred parameter: %s in: %s", toString( *assert ).c_str(), toString( appExpr ).c_str() );
+                                        InferredParams::const_iterator inferParam = appExpr->inferParams.find( (*assert)->get_uniqueId() );
+                                        assertf( inferParam != appExpr->inferParams.end(), "addInferredParams missing inferred parameter: %s in: %s", toString( *assert ).c_str(), toString( appExpr ).c_str() );
                                         Expression *newExpr = inferParam->second.expr->clone();
                                         addCast( newExpr, (*assert)->get_type(), tyVars );
@@ -837 +837 @@
                                         deref->args.push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) );
                                         deref->result = arg->get_type()->clone();
-                                        deref->result->set_lvalue( true );
                                         return deref;
                                 } // if
@@ -1764 +1763 @@
 
                 Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
-                        Type *ty = sizeofExpr->get_isType() ? 
+                        Type *ty = sizeofExpr->get_isType() ?
                                 sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
-                        
+
                         Expression * gen = genSizeof( ty );
                         if ( gen ) {