Changeset 3cbe320

Timestamp:

Oct 4, 2023, 11:04:22 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

15b5abac

Parents:

cf34e82

Message:

Translated the Link-Once pass to the new ast.

Location:

src

Files:

• CodeGen/LinkOnce.cc (modified) (5 diffs)
• CodeGen/LinkOnce.h (modified) (2 diffs)
• main.cc (modified) (1 diff)

src/CodeGen/LinkOnce.cc

@@ -10 +10 @@
 // Created On       : Thur May 13 10:10:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Thur May 13 14:39:00 2021
-// Update Count     : 0
+// Last Modified On : Wed Oct  4 10:52:00 2023
+// Update Count     : 1
 //
 
@@ -18 +18 @@
 #include <algorithm>
 
+#include "AST/Attribute.hpp"
+#include "AST/Decl.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Pass.hpp"
 #include "Common/PassVisitor.h"       // for PassVisitor, WithShortCircuiting
 
 namespace CodeGen {
 
-static bool is_cfa_linkonce( Attribute const * attr ) {
+namespace {
+
+bool is_cfa_linkonce_old( Attribute const * attr ) {
         return std::string("cfa_linkonce") == attr->name;
 }
 
-static bool is_section_attribute( Attribute const * attr ) {
+bool is_section_attribute_old( Attribute const * attr ) {
         return std::string("section") == attr->name;
 }
@@ -39 +45 @@
                 std::list< Attribute * > & attributes = decl->attributes;
                 // See if we can find the element:
-                auto found = std::find_if(attributes.begin(), attributes.end(), is_cfa_linkonce );
+                auto found = std::find_if(attributes.begin(), attributes.end(), is_cfa_linkonce_old );
                 if ( attributes.end() != found ) {
                         // Remove any other sections:
-                        attributes.remove_if( is_section_attribute );
+                        attributes.remove_if( is_section_attribute_old );
                         // Iterator to the cfa_linkonce attribute should still be valid.
                         Attribute * attribute = *found;
@@ -63 +69 @@
 };
 
+bool is_cfa_linkonce( ast::Attribute const * attr ) {
+        return "cfa_linkonce" == attr->name;
+}
+
+bool is_section_attribute( ast::Attribute const * attr ) {
+        return "section" == attr->name;
+}
+
+struct LinkOnceCore : public ast::WithShortCircuiting {
+        void previsit( ast::Decl const * ) {
+                visit_children = false;
+        }
+
+        ast::DeclWithType const * postvisit( ast::DeclWithType const * decl ) {
+                // Check to see if we have to mutate, because should be uncommon.
+                {
+                        auto & attributes = decl->attributes;
+                        auto found = std::find_if( attributes.begin(), attributes.end(),
+                                        is_cfa_linkonce );
+                        if ( attributes.end() == found ) return decl;
+                }
+                auto mutDecl = mutate( decl );
+                auto & attributes = mutDecl->attributes;
+
+                // Remove all conflicting section attributes.
+                erase_if( attributes, is_section_attribute );
+
+                // Get the attribute, and overwrite it as a section attribute.
+                auto found = std::find_if( attributes.begin(), attributes.end(),
+                                is_cfa_linkonce );
+                assert( attributes.end() != found );
+                ast::Attribute * attribute = found->get_and_mutate();
+                assert( attribute->params.empty() );
+                assert( !decl->mangleName.empty() );
+
+                attribute->name = "section";
+                attribute->params.push_back(
+                        ast::ConstantExpr::from_string( mutDecl->location,
+                                ".gnu.linkonce." + decl->mangleName
+                        )
+                );
+
+                // Unconditionnaly add "visibility(default)" to anything with
+                // .gnu.linkonce visibility is a mess otherwise.
+                attributes.push_back( new ast::Attribute( "visibility", {
+                        ast::ConstantExpr::from_string( mutDecl->location, "default" )
+                } ) );
+                return mutDecl;
+        }
+};
+
+} // namespace
+
 void translateLinkOnce( std::list< Declaration *> & translationUnit ) {
         PassVisitor<LinkOnceVisitorCore> translator;
@@ -68 +127 @@
 }
 
+void translateLinkOnce( ast::TranslationUnit & translationUnit ) {
+        ast::Pass<LinkOnceCore>::run( translationUnit );
 }
+
+} // namespace CodeGen

src/CodeGen/LinkOnce.h

@@ -10 +10 @@
 // Created On       : Thur May 13 10:06:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Thur May 13 14:38:00 2021
-// Update Count     : 0
+// Last Modified On : Wed Oct  4 10:52:00 2023
+// Update Count     : 1
 //
 
@@ -23 +23 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace CodeGen {
 
 void translateLinkOnce( std::list< Declaration *> & translationUnit );
+void translateLinkOnce( ast::TranslationUnit & translationUnit );
 /* Convert the cfa_linkonce attribute on top level declaration into
  * a special section declaration (.gnu.linkonce) so that it may be defined

src/main.cc

@@ -421 +421 @@
                 DUMP( bboxp, std::move( transUnit ) );
                 PASS( "Box", GenPoly::box, transUnit );
+                PASS( "Link-Once", CodeGen::translateLinkOnce, transUnit );
 
                 translationUnit = convert( std::move( transUnit ) );
-
-                PASS( "Link-Once", CodeGen::translateLinkOnce, translationUnit );
 
                 // Code has been lowered to C, now we can start generation.