Changeset 85521c7 for src/Common/PassVisitor.impl.h

Timestamp:

Feb 1, 2018, 5:40:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0188a0b

Parents:

d0a045c7 (diff), 33c0ce8 (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/Common/PassVisitor.impl.h (modified) (9 diffs)

src/Common/PassVisitor.impl.h

@@ -365 +365 @@
         maybeAccept_impl   ( node->attributes   , *this );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
+        indexerAddId( node );
 
         VISIT_END( node );
@@ -381 +379 @@
         maybeMutate_impl   ( node->attributes   , *this );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
+        indexerAddId( node );
 
         MUTATE_END( DeclarationWithType, node );
@@ -394 +390 @@
         VISIT_START( node );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
-
-        {
-                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                static ObjectDecl func(
-                        "__func__", noStorageClasses, LinkageSpec::C, nullptr,
-                        new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
-                        nullptr
-                );
-                indexerAddId( &func );
-                maybeAccept_impl( node->type, *this );
-                maybeAccept_impl( node->statements, *this );
-                maybeAccept_impl( node->attributes, *this );
+        indexerAddId( node );
+
+        maybeAccept_impl( node->withExprs, *this );
+        {
+                // with clause introduces a level of scope (for the with expression members).
+                // with clause exprs are added to the indexer before parameters so that parameters
+                // shadow with exprs and not the other way around.
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node->withExprs );
+                {
+                        auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                        // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                        static ObjectDecl func(
+                                "__func__", noStorageClasses, LinkageSpec::C, nullptr,
+                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
+                                nullptr
+                        );
+                        indexerAddId( &func );
+                        maybeAccept_impl( node->type, *this );
+                        maybeAccept_impl( node->statements, *this );
+                        maybeAccept_impl( node->attributes, *this );
+                }
         }
 
@@ -419 +421 @@
         MUTATE_START( node );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
-
-        {
-                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                static ObjectDecl func(
-                        "__func__", noStorageClasses, LinkageSpec::C, nullptr,
-                        new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
-                        nullptr
-                );
-                indexerAddId( &func );
-                maybeMutate_impl( node->type, *this );
-                maybeMutate_impl( node->statements, *this );
-                maybeMutate_impl( node->attributes, *this );
+        indexerAddId( node );
+
+        {
+                // with clause introduces a level of scope (for the with expression members).
+                // with clause exprs are added to the indexer before parameters so that parameters
+                // shadow with exprs and not the other way around.
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node->withExprs );
+                {
+                        auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                        // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                        static ObjectDecl func(
+                                "__func__", noStorageClasses, LinkageSpec::C, nullptr,
+                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
+                                nullptr
+                        );
+                        indexerAddId( &func );
+                        maybeMutate_impl( node->type, *this );
+                        maybeMutate_impl( node->statements, *this );
+                        maybeMutate_impl( node->attributes, *this );
+                }
         }
 
@@ -730 +737 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmStmt * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node )
+
+        maybeAccept_impl( node->instruction, *this );
+        maybeAccept_impl( node->output, *this );
+        maybeAccept_impl( node->input, *this );
+        maybeAccept_impl( node->clobber, *this );
+
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( AsmStmt * node ) {
-        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->instruction, *this );
+        maybeMutate_impl( node->output, *this );
+        maybeMutate_impl( node->input, *this );
+        maybeMutate_impl( node->clobber, *this );
+
+        MUTATE_END( Statement, node );
 }
 
@@ -868 +889 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BranchStmt * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( BranchStmt * node ) {
-        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        MUTATE_END( Statement, node );
 }
 
@@ -901 +924 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ThrowStmt * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+
+        maybeAccept_impl( node->expr, *this );
+        maybeAccept_impl( node->target, *this );
+
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ThrowStmt * node ) {
-        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->expr, *this );
+        maybeMutate_impl( node->target, *this );
+
+        MUTATE_END( Statement, node );
 }
 
@@ -996 +1029 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node );
+                indexerAddWith( node->exprs );
                 maybeAccept_impl( node->stmt, *this );
         }
@@ -1009 +1042 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node );
+                indexerAddWith( node->exprs );
                 maybeMutate_impl( node->stmt, *this );
         }