Changeset 94e0864d for src/CodeGen/CodeGenerator.cc

Timestamp:

Jun 24, 2015, 4:12:31 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, string, with_gc

Children:

1869adf

Parents:

94b4364 (diff), de62360d (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Parser/ExpressionNode.cc
src/ResolvExpr/Resolver.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 : Rob Schluntz
-// Last Modified On : Mon Jun 15 12:47:16 2015
-// Update Count     : 142
+// Last Modified On : Wed Jun 24 16:11:41 2015
+// Update Count     : 143
 //
 
@@ -77 +77 @@
                 if ( functionDecl->get_isInline() ) {
                         output << "inline ";
+                } // if
+                if ( functionDecl->get_isNoreturn() ) {
+                        output << "_Noreturn ";
                 } // if
                 output << genType( functionDecl->get_functionType(), mangleName( functionDecl ) );
@@ -303 +306 @@
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
+                                  case OT_LABELADDRESS:
                                         assert( untypedExpr->get_args().size() == 1 );
                                         output << "(";
@@ -326 +330 @@
                                         output << ")";
                                         break;
-              
+                                        
                                   case OT_CONSTANT:
                                         // there are no intrinsic definitions of 0 or 1 as functions
@@ -642 +646 @@
                         break;
                   case DeclarationNode::Inline:
-                        // handled as special via isInline flag (FIX)
+                        output << "inline ";
                         break;
                   case DeclarationNode::Fortran:
-                        // not handled
                         output << "fortran ";
                         break;
                   case DeclarationNode::Noreturn:
-                        // not handled
                         output << "_Noreturn ";
                         break;
                   case DeclarationNode::Threadlocal:
-                        // not handled
                         output << "_Thread_local ";
                         break;