Changes in / [f522618:1a42132]

Location:

src

Files:

• Common/PassVisitor.h (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (3 diffs)

src/Common/PassVisitor.h

@@ -253 +253 @@
 }
 
-class WithTypeSubstitution {
-protected:
-        WithTypeSubstitution() = default;
-        ~WithTypeSubstitution() = default;
-
-public:
-        TypeSubstitution * env;
-};
-
-class WithStmtsToAdd {
-protected:
-        WithStmtsToAdd() = default;
-        ~WithStmtsToAdd() = default;
-
-public:
-        std::list< Statement* > stmtsToAddBefore;
-        std::list< Statement* > stmtsToAddAfter;
-};
-
-class WithShortCircuiting {
-protected:
-        WithShortCircuiting() = default;
-        ~WithShortCircuiting() = default;
-
-public:
-        bool skip_children;
-};
-
-class WithScopes {
-protected:
-        WithScopes() = default;
-        ~WithScopes() = default;
-
-public:
-        at_cleanup_t at_cleanup;
-
-        template< typename T >
-        void GuardValue( T& val ) {
-                at_cleanup( [ val ]( void * newVal ) {
-                        * static_cast< T * >( newVal ) = val;
-                }, static_cast< void * >( & val ) );
-        }
-};
-
-
 #include "PassVisitor.impl.h"

src/InitTweak/GenInit.cc

@@ -44 +44 @@
         }
 
-        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
+        class ReturnFixer {
           public:
                 /// consistently allocates a temporary variable for the return value
@@ -53 +53 @@
                 void premutate( FunctionDecl *functionDecl );
                 void premutate( ReturnStmt * returnStmt );
+
+                at_cleanup_t at_cleanup;
+                std::list< Statement * > stmtsToAddBefore;
 
           protected:
@@ -157 +160 @@
 
         void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
-                GuardValue( ftype );
-                GuardValue( funcName );
+                GuardValue( this, ftype );
+                GuardValue( this, funcName );
 
                 ftype = functionDecl->get_functionType();