Changeset a12d5aa for src/CodeGen

Timestamp:

Jun 29, 2017, 5:13:42 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

435e75f

Parents:

62423350 (diff), 1abc5ab (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' into designations

File:

• src/CodeGen/FixNames.cc (modified) (2 diffs)

src/CodeGen/FixNames.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 21 14:22:59 2017
-// Update Count     : 19
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:26:00 2017
+// Update Count     : 20
 //
 
@@ -93 +93 @@
         void FixNames::fixDWT( DeclarationWithType *dwt ) {
                 if ( dwt->get_name() != "" ) {
-                        if ( LinkageSpec::isDecoratable( dwt->get_linkage() ) ) {
+                        if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
                                 dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
                                 dwt->set_scopeLevel( scopeLevel );