Changeset 23a08aa0 for src/SynTree

Timestamp:

Sep 19, 2022, 8:11:02 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

Location:

src/SynTree

Files:

• Statement.cc (modified) (4 diffs)
• Statement.h (modified) (2 diffs)
• Type.cc (modified) (1 diff)
• Type.h (modified) (3 diffs)

src/SynTree/Statement.cc

@@ -105 +105 @@
 };
 
-BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Label target, Type type ) :
         Statement(), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
@@ -113 +113 @@
 }
 
-BranchStmt::BranchStmt( Expression * computedTarget, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Expression * computedTarget, Type type ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
@@ -211 +211 @@
 }
 
-CaseStmt::CaseStmt( Expression * condition, const list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
+CaseStmt::CaseStmt( Expression * condition, const list<Statement *> & statements, bool deflt ) :
                 Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
@@ -575 +575 @@
 }
 
-MutexStmt::MutexStmt( Statement * stmt, const list<Expression *> mutexObjs ) 
+MutexStmt::MutexStmt( Statement * stmt, const list<Expression *> mutexObjs )
         : Statement(), stmt( stmt ), mutexObjs( mutexObjs ) { }
 

src/SynTree/Statement.h

@@ -200 +200 @@
         std::list<Statement *> stmts;
 
-        CaseStmt( Expression * conditions, const std::list<Statement *> & stmts, bool isdef = false ) throw (SemanticErrorException);
+        CaseStmt( Expression * conditions, const std::list<Statement *> & stmts, bool isdef = false );
         CaseStmt( const CaseStmt & other );
         virtual ~CaseStmt();
@@ -289 +289 @@
         Type type;
 
-        BranchStmt( Label target, Type ) throw (SemanticErrorException);
-        BranchStmt( Expression * computedTarget, Type ) throw (SemanticErrorException);
+        BranchStmt( Label target, Type );
+        BranchStmt( Expression * computedTarget, Type );
 
         Label get_originalTarget() { return originalTarget; }

src/SynTree/Type.cc

@@ -80 +80 @@
 // These must remain in the same order as the corresponding bit fields.
 const char * Type::FuncSpecifiersNames[] = { "inline", "_Noreturn", "fortran" };
-const char * Type::StorageClassesNames[] = { "extern", "static", "auto", "register", "_Thread_local" };
+const char * Type::StorageClassesNames[] = { "extern", "static", "auto", "register", "__thread", "_Thread_local" };
 const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "mutex", "_Atomic" };
 

src/SynTree/Type.h

@@ -84 +84 @@
         }; // FuncSpecifiers
 
-        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NumStorageClass = 5 };
+        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, ThreadlocalGcc = 1 << 4, ThreadlocalC11 = 1 << 5, NumStorageClass = 6 };
         static const char * StorageClassesNames[];
         union StorageClasses {
@@ -93 +93 @@
                         bool is_auto : 1;
                         bool is_register : 1;
-                        bool is_threadlocal : 1;
+                        bool is_threadlocalGcc : 1;
+                        bool is_threadlocalC11 : 1;
                 };
 
@@ -100 +101 @@
                 // equality (==, !=) works implicitly on first field "val", relational operations are undefined.
                 BFCommon( StorageClasses, NumStorageClass )
+
+                bool is_threadlocal_any() { return this->is_threadlocalC11 || this->is_threadlocalGcc; }
         }; // StorageClasses