Changeset 771b3c3 for src

Timestamp:

Jan 20, 2016, 1:09:05 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d63eeb0

Parents:

ca1c11f (diff), 803deb1 (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Specialize.cc

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 : Tue Jan 19 13:15:44 2016
-// Update Count     : 251
+// Last Modified On : Wed Jan 20 12:59:17 2016
+// Update Count     : 254
 //
 
@@ -408 +408 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                // 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 << "(";
+                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(), "" );
                         output << ")";
-                        castExpr->get_arg()->accept( *this );
-                        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 << ")";
         }
 

src/GenPoly/Specialize.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 10:40:37 2016
-// Update Count     : 23
+// Last Modified On : Wed Jan 20 13:00:00 2016
+// Update Count     : 24
 //
 
@@ -142 +142 @@
 
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assert( actual->get_results().size() >= 1 ); // using front, should have this assert
+                assert( ! actual->get_results().empty() ); // using front, should have this assert
                 if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         FunctionType *funType;
@@ -198 +198 @@
 
         Expression * Specialize::mutate( CastExpr *castExpr ) {
-                assert( castExpr->get_results().size() >= 1 && "Check that functions with void return aren't returning a value" );
                 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() ) {