Changeset 1132b62 for src/Tuples/TupleExpansion.cc

Timestamp:

Sep 20, 2016, 7:14:15 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

65660bd

Parents:

23b6643f

Message:

copy construct tuple function arguments, and destruct tuple function results

File:

• src/Tuples/TupleExpansion.cc (modified) (3 diffs)

src/Tuples/TupleExpansion.cc

@@ -27 +27 @@
 #include "SymTab/Mangler.h"
 #include "Common/ScopedMap.h"
+#include "ResolvExpr/typeops.h"
 
 namespace Tuples {
@@ -48 +49 @@
 
                         virtual Type * mutate( TupleType * tupleType );
+                        virtual Type * mutate( FunctionType * ftype );
 
                         virtual CompoundStmt * mutate( CompoundStmt * stmt ) {
@@ -119 +121 @@
         }
 
+        Type * TupleTypeReplacer::mutate( FunctionType * ftype ) {
+                // replace multiple-returning functions with functions which return a tuple
+                if ( ftype->get_returnVals().size() > 1 ) {
+                        TupleType * tupleType = safe_dynamic_cast<TupleType *>( ResolvExpr::extractResultType( ftype ) );
+                        ObjectDecl * retVal = new ObjectDecl( "__tuple_ret", DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, tupleType, nullptr );
+                        // xxx - replace all uses of return vals with appropriate tuple index expr
+                        deleteAll( ftype->get_returnVals() );
+                        ftype->get_returnVals().clear();
+                        ftype->get_returnVals().push_back( retVal );
+                }
+                return Parent::mutate( ftype );
+        }
+
         Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
                 std::string mangleName = SymTab::Mangler::mangleType( tupleType );