Changeset e58e423 for src/CodeGen/FixNames.cc

Timestamp:

Oct 29, 2021, 5:24:56 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

a7026b4

Parents:

42b7fa5f (diff), 8e48fca4 (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) (6 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 : Fri Dec 13 23:39:14 2019
-// Update Count     : 21
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Oct 29 15:49:00 2021
+// Update Count     : 23
 //
 
@@ -19 +19 @@
 #include <string>                  // for string, operator!=, operator==
 
+#include "AST/Chain.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Pass.hpp"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
@@ -46 +49 @@
         };
 
-        std::string mangle_main() {
-                FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
-                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
-                                };
-                main_type->get_returnVals().push_back(
-                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
-                );
-
-                auto && name = SymTab::Mangler::mangle( mainDecl.get() );
-                // std::cerr << name << std::endl;
-                return std::move(name);
-        }
-        std::string mangle_main_args() {
-                FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
-                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
-                                };
-                main_type->get_returnVals().push_back(
-                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
-                );
-
-                main_type->get_parameters().push_back(
-                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
-                );
-
-                main_type->get_parameters().push_back(
-                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
-                        new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
-                        nullptr )
-                );
-
-                auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
-                // std::cerr << name << std::endl;
-                return std::move(name);
-        }
-
-        bool is_main(const std::string& name) {
-                static std::string mains[] = {
-                        mangle_main(),
-                        mangle_main_args()
-                };
-
-                for(const auto& m : mains) {
-                        if( name == m ) return true;
-                }
-                return false;
-        }
-
         void fixNames( std::list< Declaration* > & translationUnit ) {
                 PassVisitor<FixNames> fixer;
@@ -118 +72 @@
                 fixDWT( functionDecl );
 
-                if(is_main( SymTab::Mangler::mangle(functionDecl, true, true) )) {
+                if ( FixMain::isMain( functionDecl ) ) {
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
@@ -124 +78 @@
                         }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );
-                        CodeGen::FixMain::registerMain( functionDecl );
                 }
         }
@@ -132 +85 @@
                 GuardAction( [this](){ scopeLevel--; } );
         }
+
+/// Does work with the main function and scopeLevels.
+class FixNames_new : public ast::WithGuards {
+        int scopeLevel = 1;
+
+        bool shouldSetScopeLevel( const ast::DeclWithType * dwt ) {
+                return !dwt->name.empty() && dwt->linkage.is_mangled
+                        && dwt->scopeLevel != scopeLevel;
+        }
+public:
+        const ast::ObjectDecl *postvisit( const ast::ObjectDecl *objectDecl ) {
+                if ( shouldSetScopeLevel( objectDecl ) ) {
+                        return ast::mutate_field( objectDecl, &ast::ObjectDecl::scopeLevel, scopeLevel );
+                }
+                return objectDecl;
+        }
+
+        const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
+                // This store is used to ensure a maximum of one call to mutate.
+                ast::FunctionDecl * mutDecl = nullptr;
+
+                if ( shouldSetScopeLevel( functionDecl ) ) {
+                        mutDecl = ast::mutate( functionDecl );
+                        mutDecl->scopeLevel = scopeLevel;
+                }
+
+                if ( FixMain::isMain( functionDecl ) ) {
+                        if ( !mutDecl ) { mutDecl = ast::mutate( functionDecl ); }
+
+                        int nargs = mutDecl->params.size();
+                        if ( 0 != nargs && 2 != nargs && 3 != nargs ) {
+                                SemanticError( functionDecl, "Main expected to have 0, 2 or 3 arguments\n" );
+                        }
+                        ast::chain_mutate( mutDecl->stmts )->kids.push_back(
+                                new ast::ReturnStmt(
+                                        mutDecl->location,
+                                        ast::ConstantExpr::from_int( mutDecl->location, 0 )
+                                )
+                        );
+                }
+                return mutDecl ? mutDecl : functionDecl;
+        }
+
+        void previsit( const ast::CompoundStmt * ) {
+                GuardValue( scopeLevel ) += 1;
+        }
+};
+
+void fixNames( ast::TranslationUnit & translationUnit ) {
+        ast::Pass<FixNames_new>::run( translationUnit );
+}
+
 } // namespace CodeGen