Changeset 1f44196 for src/GenPoly/Lvalue.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 'master' of plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

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
 
@@ -60 +69 @@
                 Pass1 p1;
                 Pass2 p2;
+                GeneralizedLvalue genLval;
                 mutateAll( translationUnit, p1 );
                 acceptAll( translationUnit, p2 );
+                mutateAll( translationUnit, genLval );
         }
 
@@ -99 +110 @@
                         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 +123 @@
                                 }
                                 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 +134 @@
                 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 +161 @@
                                 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