Changeset 3f80888 for src/CodeGen/CodeGenerator.cc

Timestamp:

Mar 6, 2017, 2:07:04 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

2988eeb

Parents:

df47e2f (diff), d107010 (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) (5 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 Feb 16 14:56:29 2017
-// Update Count     : 418
+// Last Modified On : Fri Mar  3 21:18:47 2017
+// Update Count     : 465
 //
 
@@ -134 +134 @@
 
                 handleStorageClass( functionDecl );
-                if ( functionDecl->get_isInline() ) {
-                        output << "inline ";
-                } // if
-                if ( functionDecl->get_isNoreturn() ) {
-                        output << "_Noreturn ";
-                } // if
+                DeclarationNode::print_FuncSpec( output, functionDecl->get_funcSpec() );
+
                 output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
 
@@ -835 +831 @@
         }
 
-
         void CodeGenerator::visit( ReturnStmt * returnStmt ) {
                 output << "return ";
@@ -899 +894 @@
         }
 
-        void CodeGenerator::handleStorageClass( Declaration * decl ) {
+        void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
                 switch ( decl->get_storageClass() ) {
+                        //output << DeclarationNode::storageClassNames[decl->get_storageClass()] << ' ';
                   case DeclarationNode::Extern:
                         output << "extern ";
@@ -913 +909 @@
                         output << "register ";
                         break;
-                  case DeclarationNode::Inline:
-                        output << "inline ";
-                        break;
-                  case DeclarationNode::Fortran:
-                        output << "fortran ";
-                        break;
-                  case DeclarationNode::Noreturn:
-                        output << "_Noreturn ";
-                        break;
                   case DeclarationNode::Threadlocal:
-                        output << "_Thread_local ";
-                        break;
+                        output << "_Thread_local ";
+                        break;
                   case DeclarationNode::NoStorageClass:
                         break;
+                  default:
+                        assert( false );
                 } // switch
-        }
+        } // CodeGenerator::handleStorageClass
 
         std::string genName( DeclarationWithType * decl ) {