Changeset 148ba7d

Timestamp:

Oct 25, 2021, 2:29:16 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

c600df1

Parents:

a36eb2d

Message:

Added a return value to WithGuards::GuardValue? so you can save the old value and set a new one in one statement.

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (3 diffs)

src/AST/Pass.hpp

@@ -348 +348 @@
 
         /// When this node is finished being visited, restore the value of a variable
+        /// You may assign to the return value to set the new value in the same statement.
         template< typename T >
-        void GuardValue( T& val ) {
+        T& GuardValue( T& val ) {
                 at_cleanup( [ val ]( void * newVal ) {
                         * static_cast< T * >( newVal ) = val;
                 }, static_cast< void * >( & val ) );
+                return val;
         }
 

src/InitTweak/GenInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Oct 25 11:10:00 2021
-// Update Count     : 185
+// Last Modified On : Mon Oct 25 13:53:00 2021
+// Update Count     : 186
 //
 #include "GenInit.h"
@@ -316 +316 @@
         void HoistArrayDimension_NoResolve_New::previsit(
                         const ast::ObjectDecl * decl ) {
-                GuardValue( storageClasses );
-                storageClasses = decl->storage;
+                GuardValue( storageClasses ) = decl->storage;
         }
 
@@ -377 +376 @@
 
         void ReturnFixer_New::previsit( const ast::FunctionDecl * decl ) {
-                GuardValue( funcDecl );
-                funcDecl = decl;
+                GuardValue( funcDecl ) = decl;
         }