Changes in / [421edab:05d47278]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• GenPoly/Specialize.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 20 12:54:50 2016
-// Update Count     : 241
+// Last Modified On : Thu Sep 17 15:24:08 2015
+// Update Count     : 231
 //
 
@@ -392 +392 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                output << "(";
-                if ( castExpr->get_results().empty() ) {
-                        output << "(void)" ;
-                } else if ( ! castExpr->get_results().front()->get_isLvalue() ) {
-                        // at least one result type of cast, but not an lvalue
-                        output << "(";
-                        output << genType( castExpr->get_results().front(), "" );
+                // if the cast is to an lvalue type, then the cast
+                // should be dropped, since the result of a cast is
+                // never an lvalue in C
+                if ( castExpr->get_results().front()->get_isLvalue() ) {
+                        castExpr->get_arg()->accept( *this );
+                } else {
+                        output << "((";
+                        if ( castExpr->get_results().empty() ) {
+                                output << "void" ;
+                        } else {
+                                output << genType( castExpr->get_results().front(), "" );
+                        } // if
                         output << ")";
-                } else {
-                        // otherwise, the cast is to an lvalue type, so the cast
-                        // should be dropped, since the result of a cast is
-                        // never an lvalue in C
+                        castExpr->get_arg()->accept( *this );
+                        output << ")";                  
                 }
-                castExpr->get_arg()->accept( *this );
-                output << ")";
         }
   

src/GenPoly/Specialize.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Specialize.cc --
+// Specialize.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 20 12:40:33 2016
-// Update Count     : 18
+// Last Modified On : Tue Sep 22 14:04:13 2015
+// Update Count     : 15
 //
 
@@ -140 +140 @@
                 return new AddressExpr( new VariableExpr( thunkFunc ) );
         }
-
+        
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assert( ! actual->get_results().empty() );
                 if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         FunctionType *funType;
@@ -199 +198 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                if ( castExpr->get_results().empty() ) {
-                        // can't specialize if we don't have a return value
-                        return castExpr;
-                }
                 Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
                 if ( specialized != castExpr->get_arg() ) {