Changeset 7fca832

Timestamp:

May 14, 2021, 5:56:42 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b1e614f4, d2afe17

Parents:

353aaba (diff), aff7e86 (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

Files:

• libcfa/src/exception.hfa (modified) (1 diff)
• src/CodeGen/LinkOnce.cc (added)
• src/CodeGen/LinkOnce.h (added)
• src/CodeGen/module.mk (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (1 diff)
• src/Virtual/Tables.cc (modified) (2 diffs)
• src/main.cc (modified) (2 diffs)
• tests/.expect/linkonce.txt (added)
• tests/Makefile.am (modified) (2 diffs)
• tests/link-once/main.cfa (added)
• tests/link-once/partner.cfa (added)

libcfa/src/exception.hfa

@@ -162 +162 @@
 // Generate a new type-id value.
 #define _EHM_TYPE_ID_VALUE(exception_name, arguments) \
-        __attribute__(( section(".gnu.linkonce." "__cfatid_" #exception_name) )) \
+        __attribute__((cfa_linkonce)) \
         _EHM_TYPE_ID_TYPE(exception_name) arguments const \
                         _EHM_TYPE_ID_NAME(exception_name) = { \

src/CodeGen/module.mk

@@ -25 +25 @@
         CodeGen/GenType.cc \
         CodeGen/GenType.h \
+        CodeGen/LinkOnce.cc \
+        CodeGen/LinkOnce.h \
         CodeGen/OperatorTable.cc \
         CodeGen/OperatorTable.h \

src/InitTweak/InitTweak.cc

@@ -1216 +1216 @@
 
         void addDataSectonAttribute( ObjectDecl * objDecl ) {
-                Type *strLitT = new PointerType( Type::Qualifiers( ),
-                        new BasicType( Type::Qualifiers( ), BasicType::Char ) );
-                std::list< Expression * > attr_params;
-                attr_params.push_back( 
-                        new ConstantExpr( Constant( strLitT, "\".data#\"", std::nullopt ) ) );
-                objDecl->attributes.push_back(new Attribute("section", attr_params));
+                objDecl->attributes.push_back(new Attribute("section", {
+                        new ConstantExpr( Constant::from_string(".data#") ),
+                }));
         }
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl ) {
-                auto strLitT = new ast::PointerType(new ast::BasicType(ast::BasicType::Char));
-                objDecl->attributes.push_back(new ast::Attribute("section", {new ast::ConstantExpr(objDecl->location, strLitT, "\".data#\"", std::nullopt)}));
+                objDecl->attributes.push_back(new ast::Attribute("section", {
+                        ast::ConstantExpr::from_string(objDecl->location, ".data#"),
+                }));
         }
 

src/Virtual/Tables.cc

@@ -172 +172 @@
 }
 
-Attribute * linkonce( const std::string & subsection ) {
-        const std::string section = ".gnu.linkonce." + subsection;
-        return new Attribute( "section", {
-                new ConstantExpr( Constant::from_string( section ) ),
-        } );
-}
-
 ObjectDecl * makeTypeIdInstance( StructInstType const * typeIdType ) {
         assert( typeIdType );
@@ -193 +186 @@
                         new AddressExpr( new NameExpr( "__cfatid_exception_t" ) )
                         ) } ),
-                { linkonce( typeid_name ) },
+                { new Attribute( "cfa_linkonce", {} ) },
                 noFuncSpecifiers
         );

src/main.cc

@@ -37 +37 @@
 #include "CodeGen/FixNames.h"               // for fixNames
 #include "CodeGen/Generate.h"               // for generate
+#include "CodeGen/LinkOnce.h"               // for translateLinkOnce
 #include "CodeTools/DeclStats.h"            // for printDeclStats
 #include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
@@ -405 +406 @@
                 PASS( "Box", GenPoly::box( translationUnit ) );
 
+                PASS( "Link-Once", CodeGen::translateLinkOnce( translationUnit ) );
+
+                // Code has been lowered to C, now we can start generation.
+
                 if ( bcodegenp ) {
                         dump( translationUnit );

tests/Makefile.am

@@ -67 +67 @@
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.cfa
-EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
+EXTRA_PROGRAMS = avl_test linkonce .dummy_hack # build but do not install
 EXTRA_DIST = test.py \
         pybin/__init__.py \
@@ -94 +94 @@
 
 avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
+linkonce_SOURCES = link-once/main.cfa link-once/partner.cfa
 # automake doesn't know we still need C/CPP rules so pretend like we have a C program
 nodist__dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp