Changeset dbc733e for src/CodeGen

Timestamp:

Sep 1, 2017, 9:53:19 PM (8 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:

f43df73

Parents:

ba2a68b (diff), b0dfbc4 (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

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• CodeGenerator.h (modified) (1 diff)
• OperatorTable.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -546 +546 @@
                 extension( addressExpr );
                 output << "(&";
-                // this hack makes sure that we don't convert "constant_zero" to "0" if we're taking its address
-                if ( VariableExpr * variableExpr = dynamic_cast< VariableExpr* >( addressExpr->get_arg() ) ) {
-                        output << mangleName( variableExpr->get_var() );
-                } else {
-                        addressExpr->get_arg()->accept( *this );
-                } // if
+                addressExpr->arg->accept( *this );
                 output << ")";
+        }
+
+        void CodeGenerator::visit( LabelAddressExpr *addressExpr ) {
+                extension( addressExpr );
+                output << "(&&" << addressExpr->arg << ")";
         }
 

src/CodeGen/CodeGenerator.h

@@ -59 +59 @@
                 virtual void visit( NameExpr *nameExpr );
                 virtual void visit( AddressExpr *addressExpr );
+                virtual void visit( LabelAddressExpr *addressExpr );
                 virtual void visit( CastExpr *castExpr );
                 virtual void visit( VirtualCastExpr *castExpr );

src/CodeGen/OperatorTable.cc

@@ -66 +66 @@
                         {       "?^=?",         "^=",   "_operator_bitxorassign",               OT_INFIXASSIGN          },
                         {       "?|=?",         "|=",   "_operator_bitorassign",                OT_INFIXASSIGN          },
-                        {       "&&",           "&&",   "&&",                                                   OT_LABELADDRESS         }
                 };