Changeset 353d168 for src/SymTab/Mangler.cc

Timestamp:

Aug 19, 2015, 3:59:45 PM (10 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:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

File:

• src/SymTab/Mangler.cc (modified) (5 diffs)

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 15:12:12 2015
-// Update Count     : 8
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 19 15:52:24 2015
+// Update Count     : 19
 //
 
@@ -30 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler() : nextVarNum( 0 ), isTopLevel( true ) {
+        Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {
         }
 
@@ -41 +41 @@
                 nextVarNum = rhs.nextVarNum;
                 isTopLevel = rhs.isTopLevel;
+                mangleOverridable = rhs.mangleOverridable;
         }
 
@@ -59 +60 @@
                 mangleName << "__";
                 maybeAccept( declaration->get_type(), *this );
+                if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
+                        // want to be able to override autogenerated and intrinsic routines,
+                        // so they need a different name mangling
+                        if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {
+                                mangleName << "autogen__";
+                        } else if ( declaration->get_linkage() == LinkageSpec::Intrinsic ) {
+                                mangleName << "intrinsic__";
+                        } else {
+                                // if we add another kind of overridable function, this has to change
+                                assert( false );
+                        } // if
+                }
                 isTopLevel = wasTopLevel;
         }
@@ -214 +227 @@
                                 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                        Mangler sub_mangler;
+                                        Mangler sub_mangler( mangleOverridable );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;