Changeset f326f99

Timestamp:

Apr 11, 2016, 4:56:43 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f77f12e2

Parents:

eab39cd

Message:

add integer suffix to mangled names so that shadowed variables are accessable (needed for destructors to work correctly)

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/FixNames.cc (modified) (4 diffs)
• SynTree/Declaration.h (modified) (4 diffs)
• SynTree/DeclarationWithType.cc (modified) (2 diffs)
• libcfa/Makefile.am (modified) (1 diff)
• libcfa/Makefile.in (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 04 17:08:06 2016
+// Last Modified On : Mon Apr 11 15:30:52 2016
 // Update Count     : 255
 //
@@ -67 +67 @@
         string mangleName( DeclarationWithType *decl ) {
                 if ( decl->get_mangleName() != "" ) {
-                        return decl->get_mangleName();
+                        // need to incorporate scope level in order to differentiate names for destructors
+                        return decl->get_scopedMangleName();
                 } else {
                         return decl->get_name();

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
 

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 04 17:14:00 2016
+// Last Modified On : Mon Apr 11 16:55:12 2016
 // Update Count     : 36
 //
@@ -22 +22 @@
 #include "Parser/LinkageSpec.h"
 #include "Parser/ParseNode.h"
+#include <string>
 
 class Declaration {
@@ -67 +68 @@
         void set_mangleName( std::string newValue ) { mangleName = newValue; }
 
+        std::string get_scopedMangleName() const { return mangleName + "_" + std::to_string(scopeLevel); }
+
+        int get_scopeLevel() const { return scopeLevel; }
+        void set_scopeLevel( int newValue ) { scopeLevel = newValue; }
+
         virtual DeclarationWithType *clone() const = 0;
         virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
@@ -75 +81 @@
         // this represents the type with all types and typedefs expanded it is generated by SymTab::Validate::Pass2
         std::string mangleName;
+        // need to remember the scope level at which the variable was declared, so that
+        // shadowed identifiers can be accessed
+        int scopeLevel = 0;
 };
 

src/SynTree/DeclarationWithType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// DeclarationWithType.cc -- 
+// DeclarationWithType.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:08:07 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Apr 11 15:35:27 2016
 // Update Count     : 3
 //
@@ -23 +23 @@
 
 DeclarationWithType::DeclarationWithType( const DeclarationWithType &other )
-                : Declaration( other ), mangleName( other.mangleName ) {
+                : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ) {
 }
 

src/libcfa/Makefile.am

@@ -67 +67 @@
 include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
 
+CLEANFILES = libcfa-prelude.c
 MAINTAINERCLEANFILES += ${includedir}/*

src/libcfa/Makefile.in

@@ -218 +218 @@
 cfaheaders = limits
 include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
+CLEANFILES = libcfa-prelude.c
 all: all-am
 
@@ -453 +454 @@
 
 clean-generic:
+        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic: