Changeset 893e106 for src/AST/Pass.proto.hpp

Timestamp:

May 22, 2019, 5:23:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

722c4831

Parents:

76ed81f (diff), ef5ef56 (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

File:

• src/AST/Pass.proto.hpp (modified) (3 diffs)

src/AST/Pass.proto.hpp

@@ -107 +107 @@
                 bool     * m_prev;
                 bool_ref * m_ref;
+        };
+
+        template<typename pass_t, typename node_t>
+        struct is_valid_previsit {
+                using ret_t = decltype( ((pass_t*)nullptr)->previsit( (const node_t *)nullptr ) );
+
+                static constexpr bool value = std::is_void< ret_t >::value ||
+                        std::is_base_of<const node_t, typename std::remove_pointer<ret_t>::type >::value;
         };
 
@@ -127 +135 @@
         static inline auto previsit( pass_t & pass, const node_t * & node, int ) -> decltype( pass.previsit( node ), void() ) {
                 static_assert(
-                        std::is_base_of<const node_t, typename std::remove_pointer<decltype( pass.previsit( node ) )>::type >::value,
-                        "Previsit may not change the type of the node. Use postvisit instead."
+                        is_valid_previsit<pass_t, node_t>::value,
+                        "Previsit may not change the type of the node. It must return its paremeter or void."
                 );
-                node = pass.previsit( node );
-                assert(node);
+                if(std::is_void< decltype( pass.previsit(node) ) >::value) {
+                        pass.previsit( node );
+                } else {
+                        node = pass.previsit( node );
+                        assert(node);
+                }
         }
 
@@ -139 +151 @@
         // PostVisit : never mutates the passed pointer but may return a different node
         template<typename pass_t, typename node_t>
-        static inline auto postvisit( pass_t & pass, const node_t * node, int ) -> decltype( pass.postvisit( node ), (const node_t *)nullptr ) {
+        static inline auto postvisit( pass_t & pass, const node_t * node, int ) ->
+                decltype( pass.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
+        {
                 return pass.postvisit( node );
         }