Changes in src/GenPoly/Specialize.cc [b3b2077:62e5546]

File:

• src/GenPoly/Specialize.cc (modified) (5 diffs)

src/GenPoly/Specialize.cc

@@ -36 +36 @@
         const std::list<Label> noLabels;
 
-        class Specialize : public PolyMutator {
+        class Specialize final : public PolyMutator {
           public:
                 Specialize( std::string paramPrefix = "_p" );
 
-                virtual Expression * mutate( ApplicationExpr *applicationExpr );
-                virtual Expression * mutate( AddressExpr *castExpr );
-                virtual Expression * mutate( CastExpr *castExpr );
+                using PolyMutator::mutate;
+                virtual Expression * mutate( ApplicationExpr *applicationExpr ) override;
+                virtual Expression * mutate( AddressExpr *castExpr ) override;
+                virtual Expression * mutate( CastExpr *castExpr ) override;
                 // virtual Expression * mutate( LogicalExpr *logicalExpr );
                 // virtual Expression * mutate( ConditionalExpr *conditionalExpr );
@@ -147 +148 @@
 
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assertf( actual->has_result(), "attempting to specialize an untyped expression" );
-                if ( needsSpecialization( formalType, actual->get_result(), env ) ) {
+                assert( ! actual->get_results().empty() ); // using front, should have this assert
+                if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         FunctionType *funType;
                         if ( ( funType = getFunctionType( formalType ) ) ) {
@@ -171 +172 @@
         void Specialize::handleExplicitParams( ApplicationExpr *appExpr ) {
                 // create thunks for the explicit parameters
-                assert( appExpr->get_function()->has_result() );
-                FunctionType *function = getFunctionType( appExpr->get_function()->get_result() );
+                assert( ! appExpr->get_function()->get_results().empty() );
+                FunctionType *function = getFunctionType( appExpr->get_function()->get_results().front() );
                 assert( function );
                 std::list< DeclarationWithType* >::iterator formal;
@@ -200 +201 @@
         Expression * Specialize::mutate( AddressExpr *addrExpr ) {
                 addrExpr->get_arg()->acceptMutator( *this );
-                assert( addrExpr->has_result() );
-                addrExpr->set_arg( doSpecialization( addrExpr->get_result(), addrExpr->get_arg() ) );
+                assert( ! addrExpr->get_results().empty() );
+                addrExpr->set_arg( doSpecialization( addrExpr->get_results().front(), addrExpr->get_arg() ) );
                 return addrExpr;
         }
@@ -207 +208 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                if ( castExpr->get_result()->isVoid() ) {
+                if ( castExpr->get_results().empty() ) {
                         // can't specialize if we don't have a return value
                         return castExpr;
                 }
-                Expression *specialized = doSpecialization( castExpr->get_result(), castExpr->get_arg() );
+                Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
                 if ( specialized != castExpr->get_arg() ) {
                         // assume here that the specialization incorporates the cast