Changeset eba74ba for src/CodeGen

Timestamp:

May 25, 2018, 2:51:06 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/CodeGen/CodeGenerator.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -119 +119 @@
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
-                if ( pretty ) return decl->get_name();
-                if ( decl->get_mangleName() != "" ) {
+                // GCC builtins should always be printed unmangled
+                if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
+                if ( decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();
                 } else {
-                        return decl->get_name();
+                        return decl->name;
                 } // if
         }