Changeset 0c577f7

Timestamp:

Oct 29, 2021, 4:03:07 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

8e48fca4

Parents:

f42fc13

Message:

Implemented new AST version of the Fix Names pass.

Location:

src

Files:

• CodeGen/FixMain.cc (modified) (3 diffs)
• CodeGen/FixMain.h (modified) (4 diffs)
• CodeGen/FixNames.cc (modified) (3 diffs)
• CodeGen/FixNames.h (modified) (2 diffs)
• main.cc (modified) (3 diffs)

src/CodeGen/FixMain.cc

@@ -22 +22 @@
 #include <string>                  // for operator<<
 
+#include "AST/Decl.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
@@ -105 +107 @@
 }
 
+bool is_main( const std::string & mangled_name ) {
+        // This breaks if you move it out of the function.
+        static const std::string mangled_mains[] = {
+                mangled_0_argument_main(),
+                mangled_2_argument_main(),
+                //mangled_3_argument_main(),
+        };
+
+        for ( auto main_name : mangled_mains ) {
+                if ( main_name == mangled_name ) return true;
+        }
+        return false;
+}
+
 struct FindMainCore {
         void previsit( FunctionDecl * decl ) {
@@ -116 +132 @@
 
 bool FixMain::isMain( FunctionDecl * decl ) {
-        // This breaks if you move it out of the function.
-        static const std::string mangled_mains[] = {
-                mangled_0_argument_main(),
-                mangled_2_argument_main(),
-                //mangled_3_argument_main(),
-        };
-
         if ( std::string("main") != decl->name ) {
                 return false;
         }
-        auto mangled_name = SymTab::Mangler::mangle( decl, true, true );
-        for ( auto main_name : mangled_mains ) {
-                if ( main_name == mangled_name ) return true;
+        return is_main( SymTab::Mangler::mangle( decl, true, true ) );
+}
+
+bool FixMain::isMain( const ast::FunctionDecl * decl ) {
+        if ( std::string("main") != decl->name ) {
+                return false;
         }
-        return false;
+        return is_main( Mangle::mangle( decl, Mangle::Type ) );
 }
 

src/CodeGen/FixMain.h

@@ -10 +10 @@
 // Created On       : Thr Jan 12 14:11:09 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 11:07:00 2021
-// Update Count     : 6
+// Last Modified On : Fri Oct 29 14:49:00 2021
+// Update Count     : 7
 //
 
@@ -24 +24 @@
 class Declaration;
 class FunctionDecl;
+namespace ast {
+        class FunctionDecl;
+}
 
 namespace CodeGen {
@@ -31 +34 @@
                         return replace_main ? LinkageSpec::Cforall : LinkageSpec::C;
                 }
-                
+
                 static inline void setReplaceMain(bool val) {
                         replace_main = val;
@@ -38 +41 @@
                 static void registerMain(FunctionDecl* val);
                 static bool isMain(FunctionDecl* decl);
+                static bool isMain(const ast::FunctionDecl * decl);
 
                 static void fix(std::ostream &os, const char* bootloader_filename);

src/CodeGen/FixNames.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 14:06:00 2021
-// Update Count     : 22
+// 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
@@ -82 +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
 

src/CodeGen/FixNames.h

@@ -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 Jul 21 22:17:33 2017
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Oct 26 13:47:00 2021
+// Update Count     : 4
 //
 
@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        struct TranslationUnit;
+}
 
 namespace CodeGen {
         /// mangles object and function names
         void fixNames( std::list< Declaration* > & translationUnit );
+        void fixNames( ast::TranslationUnit & translationUnit );
 } // namespace CodeGen
 

src/main.cc

@@ -335 +335 @@
                 PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) );
                 PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );
-                PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -348 +347 @@
                         forceFillCodeLocations( transUnit );
 
+                        PASS( "Fix Names", CodeGen::fixNames( transUnit ) );
                         PASS( "Gen Init", InitTweak::genInit( transUnit ) );
                         PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
@@ -383 +383 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
                         PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
                         PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );