Changes in / [a62749f:6e3e0717]

Location:

src/AST

Files:

• Convert.cpp (modified) (5 diffs)
• Pass.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -159 +159 @@
                 auto&& attr = get<Attribute>().acceptL( node->attributes );
                 if ( inCache( node ) ) {
-                        if(node->name == "tmp") {
-                                std::cerr << (void*)node << "(new) in cache " << (void*)this->node << "(old)" << std::endl;
-                        }
                         return nullptr;
                 }
@@ -174 +171 @@
                         Type::FuncSpecifiers( node->funcSpec.val )
                 );
-                if(node->name == "tmp") {
-                        std::cerr << (void*)node << "(new) created " << (void*)decl << "(old)" << std::endl;
-                }
                 return declWithTypePostamble( decl, node );
         }
@@ -1471 +1465 @@
 
         virtual void visit( ObjectDecl * old ) override final {
-                if( old->name == "tmp" ) {
-                        std::cerr << "building parameters for" << (void*)old << std::endl;
-                }
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& init = GET_ACCEPT_1(init, Init);
                 auto&& bfwd = GET_ACCEPT_1(bitfieldWidth, Expr);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
-                if( old->name == "tmp" ) {
-                        std::cerr << "checking cache for " << (void*)old << std::endl;
-                }
                 if ( inCache( old ) ) {
-                        if( old->name == "tmp" ) {
-                                std::cerr << (void*)old << "(old) in cache " << (void*)this->node << "(new)" << std::endl;
-                        }
                         return;
                 }
@@ -1499 +1484 @@
                 );
                 cache.emplace(old, decl);
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) added to cache with " << (void*)decl << "(new)" << std::endl;
-                }
                 assert(cache.find( old ) != cache.end());
                 decl->scopeLevel = old->scopeLevel;
@@ -1510 +1492 @@
 
                 this->node = decl;
-
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) created " << (void*)this->node << "(new)" << std::endl;
-                }
         }
 

src/AST/Pass.hpp

@@ -262 +262 @@
 /// Used to restore values/functions/etc. when the Pass finishes visiting this node
 class WithGuards {
-        __pass::at_cleanup_t at_cleanup;
-
+        __pass::at_cleanup_t at_cleanup = [](__pass::cleanup_func_t, void*) {
+                std::cerr << "No cleanup function was set" << std::endl;
+                abort();
+        };
+
+        template< typename pass_t>
+        friend auto __pass::at_cleanup( pass_t & pass, int ) -> decltype( &pass.at_cleanup );
 public:
+
         /// When this node is finished being visited, restore the value of a variable
         template< typename T >