Changeset c8c03683 for src/CodeGen

Timestamp:

Jun 14, 2016, 12:53:26 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7ff30d07

Parents:

e04ef3a (diff), d14d96a (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) (9 diffs)
• CodeGenerator.h (modified) (5 diffs)

src/CodeGen/CodeGenerator.cc

@@ -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() ) {
@@ -270 +271 @@
                                                         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 +303 @@
                                         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
@@ -384 +389 @@
                                         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
@@ -626 +631 @@
 
         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 +744 @@
 
         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 +770 @@
                 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 << ") ";
 

src/CodeGen/CodeGenerator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGenerator.h -- 
+// CodeGenerator.h --
 //
 // Author           : Richard C. Bilson
@@ -60 +60 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( ConstantExpr *constantExpr );
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
@@ -85 +85 @@
                 virtual void visit( ForStmt * );
                 virtual void visit( NullStmt * );
-                virtual void visit( DeclStmt * ); 
+                virtual void visit( DeclStmt * );
+
+                void genAttributes( std::list< Attribute * > & attributes );
 
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
@@ -114 +116 @@
 
         };
-        
+
         template< class Iterator >
         void CodeGenerator::genCommaList( Iterator begin, Iterator end ) {
@@ -125 +127 @@
                 } // for
         }
-  
+
         inline bool doSemicolon( Declaration* decl ) {
                 if ( FunctionDecl* func = dynamic_cast< FunctionDecl* >( decl ) ) {