Changeset 03e5d14 for src/SynTree

Timestamp:

May 6, 2016, 3:45:23 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:

9e2c1f0, af18713, fac84be

Parents:

37024fd

Message:

add support for constructor/destructor attribute priority and set priority for library constructors to high

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• FunctionDecl.cc (modified) (3 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 11:16:45 2016
+// Last Modified On : Fri May 06 15:39:02 2016
 // Update Count     : 33
 //
@@ -107 +107 @@
   public:
         // temporary - merge this into general GCC attributes
-        enum Attribute {
-                NoAttribute, Constructor, Destructor,
+        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 = NoAttribute );
+        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();

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 11:35:09 2016
+// Last Modified On : Fri May 06 15:41:05 2016
 // Update Count     : 19
 //
@@ -65 +65 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute ) {
-                case Constructor:
+        switch ( attribute.type ) {
+                case Attribute::Constructor:
                         os << "Global Constructor ";
                         break;
-                case Destructor:
+                case Attribute::Destructor:
                         os << "Global Destructor ";
                         break;
                 default:
                         break;
+        }
+        if ( attribute.priority != Attribute::Default ) {
+                os << "with priority " << attribute.priority << " ";
         }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
@@ -114 +117 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute ) {
-                case Constructor:
+        switch ( attribute.type ) {
+                case Attribute::Constructor:
                         os << " Global Constructor ";
                         break;
-                case Destructor:
+                case Attribute::Destructor:
                         os << " Global Destructor ";
                         break;
                 default:
                         break;
+        }
+        if ( attribute.priority != Attribute::Default ) {
+                os << "with priority " << attribute.priority << " ";
         }
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {