Changeset 16ba4a6 for src/CodeGen

Timestamp:

Nov 10, 2020, 12:20:37 AM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

18f0b70

Parents:

3febb2d

Message:

factor out resolver calls in pre-resolution stage

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• FixMain.cc (modified) (2 diffs)
• FixNames.cc (modified) (2 diffs)

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();

src/CodeGen/FixMain.cc

@@ -26 +26 @@
 #include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
 #include "SynTree/Type.h"          // for FunctionType
+#include "SymTab/Mangler.h"
 
 namespace CodeGen {
@@ -47 +48 @@
                 if( main_signature ) {
                         os << "static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return ";
+                        main_signature->mangleName = SymTab::Mangler::mangle(main_signature.get());
 
                         os << main_signature->get_scopedMangleName() << "(";

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