Changeset 39f04ec for src/CodeGen/CodeGenerator.cc

Timestamp:

Jul 5, 2016, 11:10:14 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

9bb81bb8

Parents:

a43e1d7 (diff), d32c4e2 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/CodeGen/CodeGenerator.cc (modified) (16 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 : Thu Jun  9 13:21:00 2016
-// Update Count     : 256
+// Last Modified On : Mon Jul  4 20:38:32 2016
+// Update Count     : 300
 //
 
@@ -47 +47 @@
                         dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
         }
+
+        void CodeGenerator::extension( Expression *expr ) {
+                if ( expr->get_extension() ) {
+                        output << "__extension__ ";
+                } // if
+        } // extension
+
+        void CodeGenerator::extension( Declaration *decl ) {
+                if ( decl->get_extension() ) {
+                        output << "__extension__ ";
+                } // if
+        } // extension
 
         ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
@@ -110 +122 @@
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
+                extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
 
@@ -134 +147 @@
 
         void CodeGenerator::visit( ObjectDecl *objectDecl ) {
+                extension( objectDecl );
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
@@ -170 +184 @@
 
         void CodeGenerator::visit( StructDecl *structDecl ) {
+                extension( structDecl );
                 output << "struct ";
                 handleAggregate( structDecl );
         }
 
-        void CodeGenerator::visit( UnionDecl *aggregateDecl ) {
+        void CodeGenerator::visit( UnionDecl *unionDecl ) {
+                extension( unionDecl );
                 output << "union ";
-                handleAggregate( aggregateDecl );
-        }
-
-        void CodeGenerator::visit( EnumDecl *aggDecl ) {
+                handleAggregate( unionDecl );
+        }
+
+        void CodeGenerator::visit( EnumDecl *enumDecl ) {
+                extension( enumDecl );
                 output << "enum ";
 
-                if ( aggDecl->get_name() != "" )
-                        output << aggDecl->get_name();
-
-                std::list< Declaration* > &memb = aggDecl->get_members();
+                if ( enumDecl->get_name() != "" )
+                        output << enumDecl->get_name();
+
+                std::list< Declaration* > &memb = enumDecl->get_members();
 
                 if ( ! memb.empty() ) {
@@ -208 +225 @@
         }
 
-        void CodeGenerator::visit( TraitDecl *aggregateDecl ) {}
+        void CodeGenerator::visit( TraitDecl *traitDecl ) {}
 
         void CodeGenerator::visit( TypedefDecl *typeDecl ) {
-                output << "typedef ";
-                output << genType( typeDecl->get_base(), typeDecl->get_name() );
+                assert( false && "Typedefs are removed and substituted in earlier passes." );
+                //output << "typedef ";
+                //output << genType( typeDecl->get_base(), typeDecl->get_name() );
         }
 
@@ -218 +236 @@
                 // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
                 // still to be done
+                extension( typeDecl );
                 output << "extern unsigned long " << typeDecl->get_name();
                 if ( typeDecl->get_base() ) {
@@ -251 +270 @@
                 output << "{ ";
                 if ( init->begin_initializers() == init->end_initializers() ) {
-                        // illegal to leave initializer list empty for scalar initializers,
-                        // but always legal to have 0
+                        // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
                         output << "0";
                 } else {
@@ -317 +335 @@
                                   case OT_DTOR:
                                         if ( applicationExpr->get_args().size() == 1 ) {
-                                                // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects, so must still output this expression
+                                                // the expression fed into a single parameter constructor or destructor may contain side
+                                                // effects, so must still output this expression
                                                 output << "(";
                                                 (*arg++)->accept( *this );
@@ -403 +421 @@
                                   case OT_DTOR:
                                         if ( untypedExpr->get_args().size() == 1 ) {
-                                                // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects, so must still output this expression
+                                                // the expression fed into a single parameter constructor or destructor may contain side
+                                                // effects, so must still output this expression
                                                 output << "(";
                                                 (*arg++)->accept( *this );
@@ -500 +518 @@
                         output << ")";
                 } else {
-                        // otherwise, the cast is to an lvalue type, so the cast
-                        // should be dropped, since the result of a cast is
+                        // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
                         // never an lvalue in C
                 }
@@ -546 +563 @@
 
         void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
+                // use GCC extension to avoid bumping std to C11
                 extension( alignofExpr );
-                // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
@@ -558 +575 @@
 
         void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                assert( false && "UntypedOffsetofExpr should not reach code generation" );
+                assert( false && "UntypedOffsetofExpr should not reach code generation." );
         }
 
         void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
-                extension( offsetofExpr );
                 // use GCC builtin
                 output << "__builtin_offsetof(";
@@ -571 +587 @@
 
         void CodeGenerator::visit( OffsetPackExpr *offsetPackExpr ) {
-                assert( false && "OffsetPackExpr should not reach code generation" );
+                assert( false && "OffsetPackExpr should not reach code generation." );
         }
 
@@ -612 +628 @@
 
         void CodeGenerator::visit( AsmExpr *asmExpr ) {
-                extension( asmExpr );
                 if ( asmExpr->get_inout() ) {
                         output << "[ ";
@@ -777 +792 @@
 
         void CodeGenerator::visit( ForStmt *forStmt ) {
-                // initialization is always hoisted, so don't
-                // bother doing anything with that
+                // initialization is always hoisted, so don't bother doing anything with that
                 output << "for (;";