Changeset f326f99 for src/CodeGen/CodeGenerator.cc

Timestamp:

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

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

f77f12e

Parents:

eab39cd

Message:

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

File:

• src/CodeGen/CodeGenerator.cc (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();