Changeset aa8f9df for src/GenPoly/Specialize.cc

Timestamp:

Sep 15, 2016, 3:22:50 PM (8 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:

4ab9536

Parents:

fd782b2 (diff), 906e24d (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 'replace-results-list' into tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/SymTab/Indexer.cc
src/SynTree/Mutator.cc
src/SynTree/Visitor.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

File:

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

src/GenPoly/Specialize.cc

@@ -147 +147 @@
 
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assert( ! actual->get_results().empty() ); // using front, should have this assert
-                if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
+                assert( actual->has_result() );
+                if ( needsSpecialization( formalType, actual->get_result(), env ) ) {
                         FunctionType *funType;
                         if ( ( funType = getFunctionType( formalType ) ) ) {
@@ -171 +171 @@
         void Specialize::handleExplicitParams( ApplicationExpr *appExpr ) {
                 // create thunks for the explicit parameters
-                assert( ! appExpr->get_function()->get_results().empty() );
-                FunctionType *function = getFunctionType( appExpr->get_function()->get_results().front() );
+                assert( appExpr->get_function()->has_result() );
+                FunctionType *function = getFunctionType( appExpr->get_function()->get_result() );
                 assert( function );
                 std::list< DeclarationWithType* >::iterator formal;
@@ -200 +200 @@
         Expression * Specialize::mutate( AddressExpr *addrExpr ) {
                 addrExpr->get_arg()->acceptMutator( *this );
-                assert( ! addrExpr->get_results().empty() );
-                addrExpr->set_arg( doSpecialization( addrExpr->get_results().front(), addrExpr->get_arg() ) );
+                assert( addrExpr->has_result() );
+                addrExpr->set_arg( doSpecialization( addrExpr->get_result(), addrExpr->get_arg() ) );
                 return addrExpr;
         }
@@ -207 +207 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                if ( castExpr->get_results().empty() ) {
+                if ( castExpr->get_result()->isVoid() ) {
                         // can't specialize if we don't have a return value
                         return castExpr;
                 }
-                Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
+                Expression *specialized = doSpecialization( castExpr->get_result(), castExpr->get_arg() );
                 if ( specialized != castExpr->get_arg() ) {
                         // assume here that the specialization incorporates the cast