Changeset 90152a4 for src/CodeGen/CodeGenerator.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:42:52 2017
-// Update Count     : 490
+// Last Modified On : Sat May  5 09:08:32 2018
+// Update Count     : 494
 //
 #include "CodeGenerator.h"
@@ -18 +18 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
@@ -117 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), printExprTypes( printExprTypes ), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
-                if ( pretty ) return decl->get_name();
-                if ( decl->get_mangleName() != "" ) {
+                // GCC builtins should always be printed unmangled
+                if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
+                if ( decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();
                 } else {
-                        return decl->get_name();
+                        return decl->name;
                 } // if
         }
@@ -133 +133 @@
                 output << "__attribute__ ((";
                 for ( list< Attribute * >::iterator attr( attributes.begin() );; ) {
-                        output << (*attr)->get_name();
-                        if ( ! (*attr)->get_parameters().empty() ) {
+                        output << (*attr)->name;
+                        if ( ! (*attr)->parameters.empty() ) {
                                 output << "(";
-                                genCommaList( (*attr)->get_parameters().begin(), (*attr)->get_parameters().end() );
+                                genCommaList( (*attr)->parameters.begin(), (*attr)->parameters.end() );
                                 output << ")";
                         } // if
@@ -160 +160 @@
         }
 
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes && node->result ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
+        }
+
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( functionDecl->isDeleted && genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -175 +187 @@
                         functionDecl->get_statements()->accept( *visitor );
                 } // if
+                if ( functionDecl->isDeleted ) {
+                        output << " = void";
+                }
         }
 
         void CodeGenerator::postvisit( ObjectDecl * objectDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( objectDecl->isDeleted && genC ) return;
                 if (objectDecl->get_name().empty() && genC ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
@@ -196 +213 @@
                         objectDecl->get_init()->accept( *visitor );
                 } // if
+                if ( objectDecl->isDeleted ) {
+                        output << " = void";
+                }
 
                 if ( objectDecl->get_bitfieldWidth() ) {
@@ -204 +224 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                genAttributes( aggDecl->get_attributes() );
-
-                if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
-                        genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+                        genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
                         output << ")" << endl;
                         output << indent;
                 }
 
-                output << kind << aggDecl->get_name();
+                output << kind;
+                genAttributes( aggDecl->attributes );
+                output << aggDecl->name;
 
                 if ( aggDecl->has_body() ) {
-                        std::list< Declaration * > & memb = aggDecl->get_members();
+                        std::list< Declaration * > & memb = aggDecl->members;
                         output << " {" << endl;
 
@@ -299 +319 @@
                         output << " }";
                 }
+        }
+
+        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
+                output << "_Static_assert(";
+                assertDecl->condition->accept( *visitor );
+                output << ", ";
+                assertDecl->message->accept( *visitor );
+                output << ")";
         }
 
@@ -353 +381 @@
 
         void CodeGenerator::postvisit( Constant * constant ) {
-                output << constant->get_value() ;
+                output << constant->get_value();
         }
 
@@ -570 +598 @@
                 output << "(";
                 if ( castExpr->get_result()->isVoid() ) {
-                        output << "(void)" ;
+                        output << "(void)";
                 } else {
                         // at least one result type of cast.
@@ -579 +607 @@
                         output << ")";
                 } // if
-                castExpr->get_arg()->accept( *visitor );
+                castExpr->arg->accept( *visitor );
+                output << ")";
+        }
+
+        void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
+                assertf( ! genC, "KeywordCast should not reach code generation." );
+                extension( castExpr );
+                output << "((" << castExpr->targetString() << " &)";
+                castExpr->arg->accept( *visitor );
                 output << ")";
         }
@@ -764 +800 @@
 
         void CodeGenerator::postvisit( StmtExpr * stmtExpr ) {
-                std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                std::list< Statement * > & stmts = stmtExpr->statements->kids;
                 output << "({" << endl;
                 ++indent;
@@ -775 +811 @@
                                 // cannot cast to void, otherwise the expression statement has no value
                                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
-                                        exprStmt->get_expr()->accept( *visitor );
+                                        exprStmt->expr->accept( *visitor );
                                         output << ";" << endl;
                                         ++i;
@@ -796 +832 @@
                 expr->callExpr->accept( *visitor );
         }
+
+        void CodeGenerator::postvisit( DeletedExpr * expr ) {
+                assertf( ! genC, "Deleted expressions should not reach code generation." );
+                expr->expr->accept( *visitor );
+        }
+
+        void CodeGenerator::postvisit( DefaultArgExpr * arg ) {
+                assertf( ! genC, "Default argument expressions should not reach code generation." );
+                arg->expr->accept( *visitor );
+        }
+
+        void CodeGenerator::postvisit( GenericExpr * expr ) {
+                assertf( ! genC, "C11 _Generic expressions should not reach code generation." );
+                output << "_Generic(";
+                expr->control->accept( *visitor );
+                output << ", ";
+                unsigned int numAssocs = expr->associations.size();
+                unsigned int i = 0;
+                for ( GenericExpr::Association & assoc : expr->associations ) {
+                        if (assoc.isDefault) {
+                                output << "default: ";
+                        } else {
+                                output << genType( assoc.type, "", pretty, genC ) << ": ";
+                        }
+                        assoc.expr->accept( *visitor );
+                        if ( i+1 != numAssocs ) {
+                                output << ", ";
+                        }
+                        i++;
+                }
+                output << ")";
+        }
+
 
         // *** Statements
@@ -848 +917 @@
                         } // for
                 } // if
-                output << " );" ;
+                output << " );";
         }
 
@@ -856 +925 @@
                 output << "( ";
                 if ( asmStmt->get_instruction() ) asmStmt->get_instruction()->accept( *visitor );
-                output << " )" ;
+                output << " )";
+        }
+
+        void CodeGenerator::postvisit( DirectiveStmt * dirStmt ) {
+                output << endl << dirStmt->directive;                   // endl prevents spaces before directive
         }
 
@@ -873 +946 @@
 
         void CodeGenerator::postvisit( SwitchStmt * switchStmt ) {
-                output << "switch ( " ;
+                output << "switch ( ";
                 switchStmt->get_condition()->accept( *visitor );
                 output << " ) ";
@@ -899 +972 @@
                 ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << indent << printLabels( (*i)->get_labels() ) ;
                         (*i)->accept( *visitor );
                         output << endl;
@@ -924 +997 @@
                         output << "continue";
                         break;
+                  case BranchStmt::FallThrough:
+                  case BranchStmt::FallThroughDefault:
+                        assertf( ! genC, "fallthru should not reach code generation." );
+                  output << "fallthru";
+                        break;
                 } // switch
+                // print branch target for labelled break/continue/fallthru in debug mode
+                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                        if ( ! branchStmt->get_target().empty() ) {
+                                output << " " << branchStmt->get_target();
+                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
+                                output << " default";
+                        }
+                }
                 output << ";";
         }
@@ -1023 +1109 @@
         void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << "do" ;
+                        output << "do";
                 } else {
-                        output << "while (" ;
+                        output << "while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ")";
@@ -1037 +1123 @@
 
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << " while (" ;
+                        output << " while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ");";