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

File:

• src/GenPoly/Lvalue.cc (modified) (6 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 );
@@ -99 +99 @@
                         appExpr->get_function()->acceptMutator( *this );
                         mutateAll( appExpr->get_args(), *this );
-  
-                        assert( ! appExpr->get_function()->get_results().empty() );
 
-                        PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
-                        assert( pointer );
-                        FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
-                        assert( function );
+                        PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
+                        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
 
                         Type *funType = isLvalueRet( function );
                         if ( funType && ! isIntrinsicApp( appExpr ) ) {
                                 Expression *expr = appExpr;
-                                Type *appType = appExpr->get_results().front();
+                                Type *appType = appExpr->get_result();
                                 if ( isPolyType( funType ) && ! isPolyType( appType ) ) {
                                         // make sure cast for polymorphic type is inside dereference
@@ -116 +112 @@
                                 }
                                 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->get_results().push_back( appType->clone() );
-                                appExpr->get_results().front() = new PointerType( Type::Qualifiers(), appType );
+                                deref->set_result( appType->clone() );
+                                appExpr->set_result( new PointerType( Type::Qualifiers(), appType ) );
                                 deref->get_args().push_back( expr );
                                 return deref;
@@ -127 +123 @@
                 Statement * Pass1::mutate(ReturnStmt *retStmt) {
                         if ( retval && retStmt->get_expr() ) {
-                                assert( ! retStmt->get_expr()->get_results().empty() );
-                                if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
+                                if ( retStmt->get_expr()->get_result()->get_isLvalue() ) {
                                         // ***** Code Removal ***** because casts may be stripped already
 
@@ -155 +150 @@
                                 retParm->set_type( new PointerType( Type::Qualifiers(), retParm->get_type() ) );
                         } // if
-  
+
                         Visitor::visit( funType );
                 }