Changeset f80e0218 for src/CodeGen/FixNames.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/CodeGen/FixNames.cc (modified) (4 diffs)

src/CodeGen/FixNames.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.cc -- 
+// FixNames.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:36:42 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Apr 11 15:38:10 2016
 // Update Count     : 1
 //
@@ -26 +26 @@
                 virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( FunctionDecl *functionDecl );
+
+                virtual void visit( CompoundStmt *compoundStmt );
+
+          private:
+                int scopeLevel = 1;
+
+                void fixDWT( DeclarationWithType *dwt );
         };
 
@@ -33 +40 @@
         }
 
-        void fixDWT( DeclarationWithType *dwt ) {
+        void FixNames::fixDWT( DeclarationWithType *dwt ) {
                 if ( dwt->get_name() != "" ) {
                         if ( LinkageSpec::isDecoratable( dwt->get_linkage() ) ) {
                                 dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
+                                dwt->set_scopeLevel( scopeLevel );
                         } // if
                 } // if
@@ -50 +58 @@
                 fixDWT( functionDecl );
         }
+
+        void FixNames::visit( CompoundStmt *compoundStmt ) {
+                scopeLevel++;
+                Visitor::visit( compoundStmt );
+                scopeLevel--;
+        }
 } // namespace CodeGen