Changes in src/GenPoly/Lvalue.cc [b6fd751:baba5d8]

File:

• src/GenPoly/Lvalue.cc (modified) (8 diffs)

src/GenPoly/Lvalue.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Lvalue.cc --
+// Lvalue.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -41 +41 @@
                   public:
                         Pass1();
-
+  
                         virtual Expression *mutate( ApplicationExpr *appExpr );
                         virtual Statement *mutate( ReturnStmt *appExpr );
@@ -55 +55 @@
                   private:
                 };
-
-                /// GCC-like Generalized Lvalues (which have since been removed from GCC)
-                /// https://gcc.gnu.org/onlinedocs/gcc-3.4.6/gcc/Lvalues.html#Lvalues
-                /// Replaces &(a,b) with (a, &b), &(a ? b : c) with (a ? &b : &c)
-                class GeneralizedLvalue : public Mutator {
-                        typedef Mutator Parent;
-
-                        virtual Expression * mutate( AddressExpr * addressExpr );
-                };
         } // namespace
 
@@ -69 +60 @@
                 Pass1 p1;
                 Pass2 p2;
-                GeneralizedLvalue genLval;
                 mutateAll( translationUnit, p1 );
                 acceptAll( translationUnit, p2 );
-                mutateAll( translationUnit, genLval );
         }
 
@@ -110 +99 @@
                         appExpr->get_function()->acceptMutator( *this );
                         mutateAll( appExpr->get_args(), *this );
+  
+                        assert( ! appExpr->get_function()->get_results().empty() );
 
-                        PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                        PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                        assert( pointer );
+                        FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+                        assert( function );
 
                         Type *funType = isLvalueRet( function );
                         if ( funType && ! isIntrinsicApp( appExpr ) ) {
                                 Expression *expr = appExpr;
-                                Type *appType = appExpr->get_result();
+                                Type *appType = appExpr->get_results().front();
                                 if ( isPolyType( funType ) && ! isPolyType( appType ) ) {
                                         // make sure cast for polymorphic type is inside dereference
@@ -123 +116 @@
                                 }
                                 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->set_result( appType->clone() );
-                                appExpr->set_result( new PointerType( Type::Qualifiers(), appType ) );
+                                deref->get_results().push_back( appType->clone() );
+                                appExpr->get_results().front() = new PointerType( Type::Qualifiers(), appType );
                                 deref->get_args().push_back( expr );
                                 return deref;
@@ -134 +127 @@
                 Statement * Pass1::mutate(ReturnStmt *retStmt) {
                         if ( retval && retStmt->get_expr() ) {
-                                if ( retStmt->get_expr()->get_result()->get_isLvalue() ) {
+                                assert( ! retStmt->get_expr()->get_results().empty() );
+                                if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
                                         // ***** Code Removal ***** because casts may be stripped already
 
@@ -161 +155 @@
                                 retParm->set_type( new PointerType( Type::Qualifiers(), retParm->get_type() ) );
                         } // if
-
+  
                         Visitor::visit( funType );
-                }
-
-                Expression * GeneralizedLvalue::mutate( AddressExpr * addrExpr ) {
-                        addrExpr = safe_dynamic_cast< AddressExpr * >( Parent::mutate( addrExpr ) );
-                        if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( addrExpr->get_arg() ) ) {
-                                Expression * arg1 = commaExpr->get_arg1()->clone();
-                                Expression * arg2 = commaExpr->get_arg2()->clone();
-                                delete addrExpr;
-                                return new CommaExpr( arg1, new AddressExpr( arg2 ) );
-                        } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( addrExpr->get_arg() ) ) {
-                                Expression * arg1 = condExpr->get_arg1()->clone();
-                                Expression * arg2 = condExpr->get_arg2()->clone();
-                                Expression * arg3 = condExpr->get_arg3()->clone();
-                                delete addrExpr;
-                                return new ConditionalExpr( arg1, new AddressExpr( arg2 ), new AddressExpr( arg3 ) );
-                        }
-                        return addrExpr;
                 }
         } // namespace