Changeset f28a53a for src/CodeGen

Timestamp:

Oct 7, 2015, 12:42:10 PM (10 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, string, with_gc

Children:

0800284, 50eac1b

Parents:

59cde21 (diff), 1521de20 (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 override-autogen

File:

• src/CodeGen/CodeGenerator.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 Aug 12 14:33:52 2015
-// Update Count     : 222
+// Last Modified On : Thu Sep 17 15:24:08 2015
+// Update Count     : 231
 //
 
@@ -190 +190 @@
                 if ( designators.size() == 0 ) return;
                 for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
-                        if ( NameExpr * nm = dynamic_cast< NameExpr * >( *iter ) ) {
+                        if ( dynamic_cast< NameExpr * >( *iter ) ) {
                                 // if expression is a name, then initializing aggregate member
                                 output << ".";
@@ -392 +392 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                output << "((";
-                if ( castExpr->get_results().empty() ) {
-                        output << "void" ;
-                } else {
-                        output << genType( castExpr->get_results().front(), "" );
-                } // if
-                output << ")";
-                castExpr->get_arg()->accept( *this );
-                output << ")";
+                // 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 << ")";
+                        castExpr->get_arg()->accept( *this );
+                        output << ")";                  
+                }
         }