Changeset b82d140 for src/CodeGen/CodeGenerator.cc

Timestamp:

Nov 10, 2020, 12:44:44 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

080b0a1, 883c4d9, f33eab7

Parents:

82a2fed (diff), cdacb73 (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/CodeGenerator.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -120 +120 @@
                 // GCC builtins should always be printed unmangled
                 if ( options.pretty || decl->linkage.is_gcc_builtin ) return decl->name;
-                if ( decl->mangleName != "" ) {
+                if ( LinkageSpec::isMangled(decl->linkage) && decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();