Changeset f33eab7 for src/CodeGen/FixNames.cc

Timestamp:

Nov 10, 2020, 2:45:16 PM (5 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

1d379b5

Parents:

685810e (diff), b82d140 (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/CodeGen/FixNames.cc (modified) (2 diffs)

src/CodeGen/FixNames.cc

@@ -31 +31 @@
 #include "SynTree/Type.h"          // for Type, BasicType, Type::Qualifiers
 #include "SynTree/Visitor.h"       // for Visitor, acceptAll
+#include "CompilationState.h"
 
 namespace CodeGen {
@@ -102 +103 @@
                 if ( dwt->get_name() != "" ) {
                         if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
-                                dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
+                                if (!useNewAST) {
+                                        dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
+                                }
                                 dwt->set_scopeLevel( scopeLevel );
                         } // if