Changes in src/CodeGen/CodeGenerator.cc [e04ef3a:7baed7d]

File:

• src/CodeGen/CodeGenerator.cc (modified) (24 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  9 13:21:00 2016
-// Update Count     : 256
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 06 16:01:00 2016
+// Update Count     : 255
 //
 
@@ -26 +26 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
 
 #include "Common/utility.h"
@@ -33 +34 @@
 #include "OperatorTable.h"
 #include "GenType.h"
+
+#include "InitTweak/InitTweak.h"
 
 using namespace std;
@@ -74 +77 @@
         }
 
+        void CodeGenerator::genAttributes( std::list< Attribute * > & attributes ) {
+                if ( ! attributes.empty() ) {
+                        output << "__attribute__ ((";
+                        for ( Attribute *& attr : attributes ) {
+                                if ( ! attr->empty() ) {
+                                        output << attr->get_name() << "(";
+                                        genCommaList( attr->get_parameters().begin(), attr->get_parameters().end() );
+                                        output << ")";
+                                }
+                                output << ",";
+                        }
+                        output << ")) ";
+                }
+        }
+
+
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
-                // generalize this
-                FunctionDecl::Attribute attr = functionDecl->get_attribute();
-                switch ( attr.type ) {
-                        case FunctionDecl::Attribute::Constructor:
-                                output << "__attribute__ ((constructor";
-                                if ( attr.priority != FunctionDecl::Attribute::Default ) {
-                                        output << "(" << attr.priority << ")";
-                                }
-                                output << ")) ";
-                                break;
-                        case FunctionDecl::Attribute::Destructor:
-                                output << "__attribute__ ((destructor";
-                                if ( attr.priority != FunctionDecl::Attribute::Default ) {
-                                        output << "(" << attr.priority << ")";
-                                }
-                                output << ")) ";
-                                break;
-                        default:
-                                break;
-                }
+                genAttributes( functionDecl->get_attributes() );
+
                 handleStorageClass( functionDecl );
                 if ( functionDecl->get_isInline() ) {
@@ -250 +251 @@
         //*** Expressions
         void CodeGenerator::visit( ApplicationExpr *applicationExpr ) {
-                extension( applicationExpr );
                 if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( applicationExpr->get_function() ) ) {
                         OperatorInfo opInfo;
@@ -270 +270 @@
                                                         UntypedExpr *newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
+                                                        assert( (*arg)->get_results().size() == 1 );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
+                                                        assert( type );
+                                                        newExpr->get_results().push_back( type );
                                                         *arg = newExpr;
                                                 } // if
@@ -298 +302 @@
                                         if ( applicationExpr->get_args().size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects - output as a void expression
-                                                output << "((void)(";
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
                                                 (*arg++)->accept( *this );
-                                                output << ")) /* " << opInfo.inputName << " */";
+                                                output << ") /* " << opInfo.inputName << " */";
                                         } else if ( applicationExpr->get_args().size() == 2 ) {
                                                 // intrinsic two parameter constructors are essentially bitwise assignment
@@ -362 +366 @@
 
         void CodeGenerator::visit( UntypedExpr *untypedExpr ) {
-                extension( untypedExpr );
                 if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
                         OperatorInfo opInfo;
@@ -384 +387 @@
                                         if ( untypedExpr->get_args().size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects - output as a void expression
-                                                output << "((void)(";
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
                                                 (*arg++)->accept( *this );
-                                                output << ")) /* " << opInfo.inputName << " */";
+                                                output << ") /* " << opInfo.inputName << " */";
                                         } else if ( untypedExpr->get_args().size() == 2 ) {
                                                 // intrinsic two parameter constructors are essentially bitwise assignment
@@ -447 +450 @@
 
         void CodeGenerator::visit( NameExpr *nameExpr ) {
-                extension( nameExpr );
                 OperatorInfo opInfo;
                 if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
@@ -458 +460 @@
 
         void CodeGenerator::visit( AddressExpr *addressExpr ) {
-                extension( addressExpr );
                 output << "(&";
                 // this hack makes sure that we don't convert "constant_zero" to "0" if we're taking its address
@@ -470 +471 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                extension( castExpr );
                 output << "(";
                 if ( castExpr->get_results().empty() ) {
@@ -493 +493 @@
 
         void CodeGenerator::visit( MemberExpr *memberExpr ) {
-                extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *this );
                 output << "." << mangleName( memberExpr->get_member() );
@@ -499 +498 @@
 
         void CodeGenerator::visit( VariableExpr *variableExpr ) {
-                extension( variableExpr );
                 OperatorInfo opInfo;
                 if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && operatorLookup( variableExpr->get_var()->get_name(), opInfo ) && opInfo.type == OT_CONSTANT ) {
@@ -510 +508 @@
         void CodeGenerator::visit( ConstantExpr *constantExpr ) {
                 assert( constantExpr->get_constant() );
-                extension( constantExpr );
                 constantExpr->get_constant()->accept( *this );
         }
 
         void CodeGenerator::visit( SizeofExpr *sizeofExpr ) {
-                extension( sizeofExpr );
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
@@ -526 +522 @@
 
         void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
-                extension( alignofExpr );
                 // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
@@ -542 +537 @@
 
         void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
-                extension( offsetofExpr );
                 // use GCC builtin
                 output << "__builtin_offsetof(";
@@ -555 +549 @@
 
         void CodeGenerator::visit( LogicalExpr *logicalExpr ) {
-                extension( logicalExpr );
                 output << "(";
                 logicalExpr->get_arg1()->accept( *this );
@@ -568 +561 @@
 
         void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) {
-                extension( conditionalExpr );
                 output << "(";
                 conditionalExpr->get_arg1()->accept( *this );
@@ -579 +571 @@
 
         void CodeGenerator::visit( CommaExpr *commaExpr ) {
-                extension( commaExpr );
                 output << "(";
                 commaExpr->get_arg1()->accept( *this );
@@ -592 +583 @@
 
         void CodeGenerator::visit( AsmExpr *asmExpr ) {
-                extension( asmExpr );
                 if ( asmExpr->get_inout() ) {
                         output << "[ ";
@@ -626 +616 @@
 
         void CodeGenerator::visit( ExprStmt *exprStmt ) {
-                // I don't see why this check is necessary.
-                // If this starts to cause problems then put it back in,
-                // with an explanation
                 assert( exprStmt );
-
-                // if ( exprStmt != 0 ) {
-                exprStmt->get_expr()->accept( *this );
-                output << ";" ;
-                // } // if
+                // cast the top-level expression to void to reduce gcc warnings.
+                Expression * expr = new CastExpr( exprStmt->get_expr() );
+                expr->accept( *this );
+                output << ";";
         }
 
@@ -743 +729 @@
 
         void CodeGenerator::visit( WhileStmt *whileStmt ) {
-                if ( whileStmt->get_isDoWhile() )
+                if ( whileStmt->get_isDoWhile() ) {
                         output << "do" ;
-                else {
+                } else {
                         output << "while (" ;
                         whileStmt->get_condition()->accept( *this );
@@ -769 +755 @@
                 output << "for (;";
 
-                if ( forStmt->get_condition() != 0 )
+                if ( forStmt->get_condition() != 0 ) {
                         forStmt->get_condition()->accept( *this );
+                }
                 output << ";";
 
-                if ( forStmt->get_increment() != 0 )
-                        forStmt->get_increment()->accept( *this );
+                if ( forStmt->get_increment() != 0 ) {
+                        // cast the top-level expression to void to reduce gcc warnings.
+                        Expression * expr = new CastExpr( forStmt->get_increment() );
+                        expr->accept( *this );
+                }
                 output << ") ";