Changeset 981bdc6 for src/SynTree

Timestamp:

Jan 12, 2017, 2:05:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

File:

• src/SynTree/FunctionDecl.cc (modified) (1 diff)

src/SynTree/FunctionDecl.cc

@@ -23 +23 @@
 #include "InitTweak/InitTweak.h"
 
+extern bool translation_unit_nomain;
+
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
                 : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
-        // this is a brazen hack to force the function "main" to have C linkage
+        // this is a brazen hack to force the function "main" to have Cforall linkage
+        // because we want to replace the main even if it is inside an extern
         if ( name == "main" ) {
-                set_linkage( LinkageSpec::C );
+                set_linkage( translation_unit_nomain ? LinkageSpec::C : LinkageSpec::Cforall );
         } // if
 }