Changeset 4c925cd for src/SymTab/Mangler.cc

Timestamp:

Aug 14, 2020, 11:40:04 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5715d43, fa5e0112

Parents:

309d814 (diff), badd22f (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/SymTab/Mangler.cc (modified) (2 diffs)

src/SymTab/Mangler.cc

@@ -447 +447 @@
                 ast::Pass<Mangler_new> mangler( mode );
                 maybeAccept( decl, mangler );
-                return mangler.pass.get_mangleName();
+                return mangler.core.get_mangleName();
         }
 
@@ -691 +691 @@
                                                                 mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
                                                         assert->accept( sub_mangler );
-                                                        assertionNames.push_back( sub_mangler.pass.get_mangleName() );
+                                                        assertionNames.push_back( sub_mangler.core.get_mangleName() );
                                                         acount++;
                                                 } // for