Changeset cc287800 for src/ControlStruct

Timestamp:

Nov 8, 2021, 5:28:21 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

36a05d7

Parents:

949339b (diff), 5ee153d (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:

• ExceptTranslate.cc (modified) (1 diff)
• ExceptTranslate.h (modified) (2 diffs)
• ExceptTranslateNew.cpp (added)
• FixLabels.cpp (added)
• FixLabels.hpp (added)
• LabelGenerator.cc (modified) (4 diffs)
• LabelGenerator.h (modified) (2 diffs)
• MultiLevelExit.cpp (added)
• MultiLevelExit.hpp (added)
• module.mk (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptVisitor.cc --
+// ExceptTranslate.cc -- Conversion of exception control flow structures.
 //
 // Author           : Andrew Beach

src/ControlStruct/ExceptTranslate.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExceptTranslate.h --
+// ExceptTranslate.h -- Conversion of exception control flow structures.
 //
 // Author           : Andrew Beach
 // Created On       : Tus Jun 06 10:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May 19 11:47:00 2020
-// Update Count     : 5
+// Last Modified On : Mon Nov  8 11:43:00 2020
+// Update Count     : 6
 //
 
@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace ControlStruct {
         void translateThrows( std::list< Declaration *> & translationUnit );
+        void translateThrows( ast::TranslationUnit & transUnit );
         /* Replaces all throw & throwResume statements with function calls.
          * These still need to be resolved, so call this before the reslover.

src/ControlStruct/LabelGenerator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 11 22:23:20 2019
-// Update Count     : 15
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  8 10:18:00 2021
+// Update Count     : 17
 //
 
@@ -19 +19 @@
 
 #include "LabelGenerator.h"
+
+#include "AST/Attribute.hpp"
+#include "AST/Label.hpp"
+#include "AST/Stmt.hpp"
 #include "SynTree/Attribute.h"  // for Attribute
 #include "SynTree/Label.h"      // for Label, operator<<
@@ -24 +28 @@
 
 namespace ControlStruct {
-        LabelGenerator * LabelGenerator::labelGenerator = 0;
+
+int LabelGenerator::current = 0;
+LabelGenerator * LabelGenerator::labelGenerator = nullptr;
 
         LabelGenerator * LabelGenerator::getGenerator() {
@@ -43 +49 @@
                 return l;
         }
+
+ast::Label LabelGenerator::newLabel(
+                const std::string & suffix, const ast::Stmt * stmt ) {
+        assert( stmt );
+
+        std::ostringstream os;
+        os << "__L" << current++ << "__" << suffix;
+        if ( stmt && !stmt->labels.empty() ) {
+                os << "_" << stmt->labels.front() << "__";
+        }
+        ast::Label ret_label( stmt->location, os.str() );
+        ret_label.attributes.push_back( new ast::Attribute( "unused" ) );
+        return ret_label;
+}
+
 } // namespace ControlStruct
 

src/ControlStruct/LabelGenerator.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:20:14 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  8 10:16:00 2021
+// Update Count     : 8
 //
 
@@ -21 +21 @@
 
 class Statement;
+namespace ast {
+        class Stmt;
+        class Label;
+}
 
 namespace ControlStruct {
-        class LabelGenerator {
-          public:
-                static LabelGenerator *getGenerator();
-                Label newLabel(std::string suffix, Statement * stmt = nullptr);
-                void reset() { current = 0; }
-                void rewind() { current--; }
-          protected:
-                LabelGenerator(): current(0) {}
-          private:
-                int current;
-                static LabelGenerator *labelGenerator;
-        };
+
+class LabelGenerator {
+        static int current;
+        static LabelGenerator *labelGenerator;
+protected:
+        LabelGenerator() {}
+public:
+        static LabelGenerator *getGenerator();
+        static Label newLabel(std::string suffix, Statement * stmt = nullptr);
+        static ast::Label newLabel( const std::string&, const ast::Stmt * );
+        static void reset() { current = 0; }
+        static void rewind() { current--; }
+};
+
 } // namespace ControlStruct
 

src/ControlStruct/module.mk

@@ -18 +18 @@
         ControlStruct/ExceptDecl.cc \
         ControlStruct/ExceptDecl.h \
+        ControlStruct/FixLabels.cpp \
+        ControlStruct/FixLabels.hpp \
         ControlStruct/ForExprMutator.cc \
         ControlStruct/ForExprMutator.h \
@@ -26 +28 @@
         ControlStruct/MLEMutator.cc \
         ControlStruct/MLEMutator.h \
+        ControlStruct/MultiLevelExit.cpp \
+        ControlStruct/MultiLevelExit.hpp \
         ControlStruct/Mutate.cc \
         ControlStruct/Mutate.h
 
-SRC += $(SRC_CONTROLSTRUCT) ControlStruct/ExceptTranslate.cc ControlStruct/ExceptTranslate.h
+SRC += $(SRC_CONTROLSTRUCT) \
+        ControlStruct/ExceptTranslateNew.cpp \
+        ControlStruct/ExceptTranslate.cc \
+        ControlStruct/ExceptTranslate.h
+
 SRCDEMANGLE += $(SRC_CONTROLSTRUCT)