Changeset 6726a3a for src/ControlStruct

Timestamp:

Jul 20, 2022, 2:37:57 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

6bf35d1, e6662f5

Parents:

d677355 (diff), 2fd0de0 (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:software/cfa/cfa-cc

Location:

src/ControlStruct

Files:

• ExceptDecl.cc (modified) (1 diff)
• ExceptDecl.h (modified) (2 diffs)
• ExceptDeclNew.cpp (added)
• HoistControlDecls.hpp (modified) (1 diff)
• MultiLevelExit.cpp (modified) (6 diffs)
• module.mk (modified) (1 diff)

src/ControlStruct/ExceptDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptDecl.cc --
+// ExceptDecl.cc -- Handles declarations of exception types.
 //
 // Author           : Henry Xue

src/ControlStruct/ExceptDecl.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptDecl.h --
+// ExceptDecl.h -- Handles declarations of exception types.
 //
 // Author           : Henry Xue
 // Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:10:50 2021
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 15:49:00 2022
+// Update Count     : 2
 //
 
@@ -20 +20 @@
 class Declaration;
 
+namespace ast {
+        class TranslationUnit;
+}
+
 namespace ControlStruct {
-        void translateExcept( std::list< Declaration *> & translationUnit );
+/// Unfold exception declarations into raw structure declarations.
+/// Also builds vtable declarations and converts vtable types.
+void translateExcept( std::list< Declaration *> & translationUnit );
+void translateExcept( ast::TranslationUnit & translationUnit );
 }

src/ControlStruct/HoistControlDecls.hpp

@@ -21 +21 @@
 
 namespace ControlStruct {
-// Hoist declarations out of control flow statements into compound statement.
+/// Hoist declarations out of control flow statements into compound statement.
+/// Must happen before auto-gen routines are added.
 void hoistControlDecls( ast::TranslationUnit & translationUnit );
 } // namespace ControlStruct

src/ControlStruct/MultiLevelExit.cpp

@@ -149 +149 @@
 };
 
-NullStmt * labelledNullStmt(
-        const CodeLocation & cl, const Label & label ) {
+NullStmt * labelledNullStmt( const CodeLocation & cl, const Label & label ) {
         return new NullStmt( cl, vector<Label>{ label } );
 }
@@ -164 +163 @@
 
 const CompoundStmt * MultiLevelExitCore::previsit(
-        const CompoundStmt * stmt ) {
+                const CompoundStmt * stmt ) {
         visit_children = false;
 
@@ -189 +188 @@
 }
 
-size_t getUnusedIndex(
-        const Stmt * stmt, const Label & originalTarget ) {
+size_t getUnusedIndex( const Stmt * stmt, const Label & originalTarget ) {
         const size_t size = stmt->labels.size();
 
@@ -210 +208 @@
 }
 
-const Stmt * addUnused(
-        const Stmt * stmt, const Label & originalTarget ) {
+const Stmt * addUnused( const Stmt * stmt, const Label & originalTarget ) {
         size_t i = getUnusedIndex( stmt, originalTarget );
         if ( i == stmt->labels.size() ) {
@@ -356 +353 @@
 
 // Mimic what the built-in push_front would do anyways. It is O(n).
-void push_front(
-        vector<ptr<Stmt>> & vec, const Stmt * element ) {
+void push_front( vector<ptr<Stmt>> & vec, const Stmt * element ) {
         vec.emplace_back( nullptr );
         for ( size_t i = vec.size() - 1 ; 0 < i ; --i ) {
@@ -590 +586 @@
 
                 ptr<Stmt> else_stmt = nullptr;
-                Stmt * loop_kid = nullptr;
+                const Stmt * loop_kid = nullptr;
                 // check if loop node and if so add else clause if it exists
-                const WhileDoStmt * whilePtr = dynamic_cast<const WhileDoStmt *>(kid.get());
-                if ( whilePtr && whilePtr->else_) {
+                const WhileDoStmt * whilePtr = kid.as<WhileDoStmt>();
+                if ( whilePtr && whilePtr->else_ ) {
                         else_stmt = whilePtr->else_;
-                        WhileDoStmt * mutate_ptr = mutate(whilePtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
-                }
-                const ForStmt * forPtr = dynamic_cast<const ForStmt *>(kid.get());
-                if ( forPtr && forPtr->else_) {
+                        loop_kid = mutate_field( whilePtr, &WhileDoStmt::else_, nullptr );
+                }
+                const ForStmt * forPtr = kid.as<ForStmt>();
+                if ( forPtr && forPtr->else_ ) {
                         else_stmt = forPtr->else_;
-                        ForStmt * mutate_ptr = mutate(forPtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
+                        loop_kid = mutate_field( forPtr, &ForStmt::else_, nullptr );
                 }
 

src/ControlStruct/module.mk

@@ -17 +17 @@
 SRC += \
         ControlStruct/ExceptDecl.cc \
+        ControlStruct/ExceptDeclNew.cpp \
         ControlStruct/ExceptDecl.h \
         ControlStruct/ExceptTranslateNew.cpp \