Changeset 4e24610 for src/SynTree

Timestamp:

May 6, 2016, 1:56:08 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, with_gc

Children:

d029162e

Parents:

711eee5

Message:

Add constructor attribute to global initializer function, don't try to fix const globals, add Constructor/Destructor? attributes to FunctionDecl?

Location:

src/SynTree

Files:

• Declaration.h (modified) (4 diffs)
• FunctionDecl.cc (modified) (4 diffs)

src/SynTree/Declaration.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Declaration.h -- 
+// Declaration.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:28:11 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 06 11:16:45 2016
 // Update Count     : 33
 //
@@ -106 +106 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn );
+        // temporary - merge this into general GCC attributes
+        enum Attribute {
+                NoAttribute, Constructor, Destructor,
+        };
+
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute = NoAttribute );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -119 +124 @@
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
+        Attribute get_attribute() const { return attribute; }
+        void set_attribute( Attribute newValue ) { attribute = newValue; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -130 +137 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
+        Attribute attribute;
 };
 

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 01 11:40:07 2016
+// Last Modified On : Fri May 06 11:35:09 2016
 // Update Count     : 19
 //
@@ -21 +21 @@
 #include "Common/utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ) {
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute )
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), attribute( attribute ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
+        // this is a brazen hack to force the function "main" to have C linkage
+        if ( name == "main" ) {
+                set_linkage( LinkageSpec::C );
+        } // if
 }
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), attribute( other.attribute ) {
 }
 
@@ -61 +65 @@
                 os << "_Noreturn ";
         } // if
+        switch ( attribute ) {
+                case Constructor:
+                        os << "Global Constructor ";
+                        break;
+                case Destructor:
+                        os << "Global Destructor ";
+                        break;
+                default:
+                        break;
+        }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
@@ -100 +114 @@
                 os << "_Noreturn ";
         } // if
+        switch ( attribute ) {
+                case Constructor:
+                        os << " Global Constructor ";
+                        break;
+                case Destructor:
+                        os << " Global Destructor ";
+                        break;
+                default:
+                        break;
+        }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';