Changeset 8d66610 for src

Timestamp:

May 21, 2021, 4:48:10 PM (5 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, stuck-waitfor-destruct

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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

Location:

src

Files:

• CodeGen/LinkOnce.cc (added)
• CodeGen/LinkOnce.h (added)
• CodeGen/module.mk (modified) (1 diff)
• Concurrency/Keywords.cc (modified) (2 diffs)
• GenPoly/Box.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (1 diff)
• Virtual/ExpandCasts.cc (modified) (2 diffs)
• Virtual/Tables.cc (modified) (2 diffs)
• main.cc (modified) (2 diffs)

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/Concurrency/Keywords.cc

@@ -432 +432 @@
                                 new ObjectDecl(
                                         Virtual::concurrentDefaultVTableName(),
-                                        Type::Const,
+                                        noStorageClasses,
                                         LinkageSpec::Cforall,
                                         /* bitfieldWidth */ nullptr,
@@ -504 +504 @@
                         new ObjectDecl(
                                 Virtual::concurrentDefaultVTableName(),
-                                Type::Const,
+                                Type::StorageClasses( Type::Extern ),
                                 LinkageSpec::Cforall,
                                 /* bitfieldWidth */ nullptr,

src/GenPoly/Box.cc

@@ -1525 +1525 @@
                                         stmtsToAddBefore.push_back( new DeclStmt( newBuf ) );
 
+                                        // if the object has a cleanup attribute, the cleanup should be on the buffer, not the pointer
+                                        auto matchAndMove = [newBuf](Attribute * attr){
+                                                if(attr->name == "cleanup") {
+                                                        newBuf->attributes.push_back(attr);
+                                                        return true;
+                                                }
+                                                return false;
+                                        };
+
+                                        objectDecl->attributes.remove_if(matchAndMove);
+
                                         delete objectDecl->get_init();
                                         objectDecl->set_init( new SingleInit( new VariableExpr( newBuf ) ) );

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/Parser/DeclarationNode.cc

@@ -1076 +1076 @@
         if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 // otype is internally converted to dtype + otype parameters
-                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::ALtype };
+                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::Dtype };
                 static_assert( sizeof(kindMap) / sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype || variable.tyClass == TypeDecl::ALtype, variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;

src/Virtual/ExpandCasts.cc

@@ -105 +105 @@
         void VirtualCastCore::premutate( FunctionDecl * functionDecl ) {
                 if ( (! vcast_decl) &&
-                     functionDecl->get_name() == "__cfa__virtual_cast" ) {
+                     functionDecl->get_name() == "__cfavir_virtual_cast" ) {
                         vcast_decl = functionDecl;
                 }
@@ -113 +113 @@
                 if ( pvt_decl || ! structDecl->has_body() ) {
                         return;
-                } else if ( structDecl->get_name() == "__cfa__parent_vtable" ) {
+                } else if ( structDecl->get_name() == "__cfavir_type_info" ) {
                         pvt_decl = structDecl;
                 }

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