Changes in / [9e63a2b:cca568e]

Files:

• src/Common/Stats/Time.h (modified) (3 diffs)
• src/ControlStruct/MLEMutator.cc (modified) (2 diffs)
• src/ControlStruct/MLEMutator.h (modified) (2 diffs)
• src/SymTab/Validate.cc (modified) (1 diff)
• tests/.expect/except-finally-error.txt (deleted)
• tests/except-finally-error.cfa (deleted)

src/Common/Stats/Time.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Mar 01 15:14:11 2019
-// Last Modified By : Andrew Beach
+// Last Modified By :
 // Last Modified On :
 // Update Count     :
@@ -41 +41 @@
                                 f();
                         }
-
-                        template<typename ret_t = void, typename func_t, typename... arg_t>
-                        inline ret_t TimeCall(
-                                        const char *, func_t func, arg_t&&... arg) {
-                                return func(std::forward<arg_t>(arg)...);
-                        }
 #               else
                         void StartGlobal();
@@ -65 +59 @@
                                 func();
                         }
-
-                        template<typename ret_t = void, typename func_t, typename... arg_t>
-                        inline ret_t TimeCall(
-                                        const char * name, func_t func, arg_t&&... arg) {
-                                BlockGuard guard(name);
-                                return func(std::forward<arg_t>(arg)...);
-                        }
 #               endif
         }

src/ControlStruct/MLEMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Jan 16 15:33:00 2020
-// Update Count     : 221
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Oct 22 17:22:44 2019
+// Update Count     : 220
 //
 
@@ -331 +331 @@
         }
 
-        void MLEMutator::premutate( FinallyStmt * ) {
-                GuardAction([this, old = std::move(enclosingControlStructures)]() {
-                        enclosingControlStructures = std::move(old);
-                });
-                enclosingControlStructures = std::list<Entry>();
-        }
-
         void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;

src/ControlStruct/MLEMutator.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Jan 16 12:46:00 2020
-// Update Count     : 46
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Oct 22 17:22:47 2019
+// Update Count     : 45
 //
-
-// Can anyone figure out what MLE stands for?
 
 #pragma once
@@ -51 +49 @@
                 void premutate( TryStmt *tryStmt );
                 Statement * postmutate( TryStmt *tryStmt );
-                void premutate( FinallyStmt *finallyStmt );
 
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );

src/SymTab/Validate.cc

@@ -375 +375 @@
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
-                        Stats::Time::TimeCall("Fix Object Type",
-                                FixObjectType::fix, translationUnit);
-                        Stats::Time::TimeCall("Array Length",
-                                ArrayLength::computeLength, translationUnit);
-                        Stats::Time::TimeCall("Find Special Declarations",
-                                Validate::findSpecialDecls, translationUnit);
-                        Stats::Time::TimeCall("Fix Label Address",
-                                mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
-                        Stats::Time::TimeCall("Handle Attributes",
-                                Validate::handleAttributes, translationUnit);
+                        Stats::Time::TimeBlock("Fix Object Type", [&]() {
+                                FixObjectType::fix( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Array Length", [&]() {
+                                ArrayLength::computeLength( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
+                                Validate::findSpecialDecls( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Fix Label Address", [&]() {
+                                mutateAll( translationUnit, labelAddrFixer );
+                        });
+                        Stats::Time::TimeBlock("Handle Attributes", [&]() {
+                                Validate::handleAttributes( translationUnit );
+                        });
                 }
         }