Changeset 9e2c1f0 for src/SynTree

Timestamp:

May 6, 2016, 4:28:50 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:

ec79847

Parents:

99ee64d (diff), 03e5d14 (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 'global-init' into ctor and add global destroy function to call destructors on global objects

Conflicts:

src/CodeGen/CodeGenerator.cc
src/InitTweak/module.mk
src/Makefile.in
src/SynTree/Declaration.h
src/SynTree/FunctionDecl.cc
src/main.cc

Location:

src/SynTree

Files:

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

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 16:55:12 2016
-// Update Count     : 36
+// Last Modified On : Fri May 06 16:26:12 2016
+// Update Count     : 33
 //
 
@@ -115 +115 @@
         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
+        struct Attribute {
+                enum Type {
+                        NoAttribute, Constructor, Destructor,
+                } type;
+                enum Priority {
+                        // priorities 0-100 are reserved by gcc, so it's okay to use 100 an exceptional case
+                        Default = 100, High,
+                } priority;
+                Attribute(Type t = NoAttribute, Priority p = Default) : type(t), priority(p) {};
+        };
+
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute = Attribute() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -128 +140 @@
         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 ); }
@@ -139 +153 @@
         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 : Tue May 03 15:37:43 2016
+// Last Modified On : Fri May 06 15:59:48 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 );
@@ -32 +32 @@
 
 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 ) {
 }
 
@@ -65 +65 @@
                 os << "_Noreturn ";
         } // if
+        switch ( attribute.type ) {
+                case Attribute::Constructor:
+                        os << "Global Constructor ";
+                        break;
+                case Attribute::Destructor:
+                        os << "Global Destructor ";
+                        break;
+                default:
+                        break;
+        }
+        if ( attribute.priority != Attribute::Default ) {
+                os << "with priority " << attribute.priority << " ";
+        }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
@@ -105 +118 @@
                 os << "_Noreturn ";
         } // if
+        switch ( attribute.type ) {
+                case Attribute::Constructor:
+                        os << " Global Constructor ";
+                        break;
+                case Attribute::Destructor:
+                        os << " Global Destructor ";
+                        break;
+                default:
+                        break;
+        }
+        if ( attribute.priority != Attribute::Default ) {
+                os << "with priority " << attribute.priority << " ";
+        }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';