Changeset e67a82d for src/SymTab/Mangler.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

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