Changeset 6e21aaf

Timestamp:

Jun 26, 2022, 10:29:22 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

9b817e15

Parents:

8446c18 (diff), 91715ce1 (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/heap.cfa (modified) (1 diff)
• src/AST/Inspect.cpp (added)
• src/AST/Inspect.hpp (added)
• src/AST/module.mk (modified) (1 diff)
• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)
• src/GenPoly/Box.cc (modified) (1 diff)
• src/Validate/Autogen.cpp (modified) (4 diffs)
• tests/.expect/attributes.nast.arm64.txt (modified) (1 diff)
• tests/.expect/attributes.nast.x64.txt (modified) (1 diff)
• tests/.expect/attributes.nast.x86.txt (modified) (1 diff)
• tests/.expect/attributes.oast.x64.txt (modified) (1 diff)

libcfa/src/heap.cfa

@@ -509 +509 @@
         checkHeader( header < (Heap.Storage.Header *)heapBegin || (Heap.Storage.Header *)heapEnd < header, name, addr ); // bad address ? (offset could be + or -)
 
-        Heap * homeManager;
         if ( unlikely( freeHead == 0p || // freed and only free-list node => null link
                                    // freed and link points at another free block not to a bucket in the bucket array.

src/AST/module.mk

@@ -37 +37 @@
         AST/Init.cpp \
         AST/Init.hpp \
+        AST/Inspect.cpp \
+        AST/Inspect.hpp \
         AST/Label.hpp \
         AST/LinkageSpec.cpp \

src/CodeGen/CodeGenerator.cc

@@ -294 +294 @@
                                 } else {
                                         if ( obj->get_init() ) {
-                                                obj->get_init()->accept( *visitor ); 
+                                                obj->get_init()->accept( *visitor );
                                         } else {
                                                 // Should not reach here!
@@ -683 +683 @@
                 extension( variableExpr );
                 const OperatorInfo * opInfo;
-                if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
+                if( dynamic_cast<ZeroType*>( variableExpr->get_var()->get_type() ) ) {
+                        output << "0";
+                } else if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
                         output << opInfo->symbol;
                 } else {
-                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())
                         // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
                         //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';

src/GenPoly/Box.cc

@@ -1277 +1277 @@
                         FunctionType * ftype = functionDecl->type;
                         if ( ! ftype->returnVals.empty() && functionDecl->statements ) {
-                                if ( ! isPrefix( functionDecl->name, "_thunk" ) && ! isPrefix( functionDecl->name, "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
+                                // intrinsic functions won't be using the _retval so no need to generate it.
+                                if ( functionDecl->linkage != LinkageSpec::Intrinsic && !isPrefix( functionDecl->name, "_thunk" ) && ! isPrefix( functionDecl->name, "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
                                         assert( ftype->returnVals.size() == 1 );
                                         DeclarationWithType * retval = ftype->returnVals.front();

src/Validate/Autogen.cpp

@@ -28 +28 @@
 #include "AST/DeclReplacer.hpp"
 #include "AST/Expr.hpp"
+#include "AST/Inspect.hpp"
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
@@ -121 +122 @@
 
         // Built-ins do not use autogeneration.
-        bool shouldAutogen() const final { return !decl->linkage.is_builtin; }
+        bool shouldAutogen() const final { return !decl->linkage.is_builtin && !structHasFlexibleArray(decl); }
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
@@ -183 +184 @@
         {
                 // TODO: These functions are somewhere between instrinsic and autogen,
-                // could possibly use a new linkage type. For now we just make them
-                // intrinsic to code-gen them as C assignments.
-                proto_linkage = ast::Linkage::Intrinsic;
+                // could possibly use a new linkage type. For now we just make the
+                // basic ones intrinsic to code-gen them as C assignments.
+                const auto & real_type = decl->base;
+                const auto & basic = real_type.as<ast::BasicType>();
+                if(!real_type || (basic && basic->isInteger())) proto_linkage = ast::Linkage::Intrinsic;
         }
 
@@ -402 +405 @@
         auto retval = srcParam();
         retval->name = "_ret";
-        // xxx - Adding this unused attribute can slience unused variable warning
-        // However, some code might not be compiled as expected
-        // Temporarily disabled
-        // retval->attributes.push_back(new ast::Attribute("unused"));
         return genProto( "?=?", { dstParam(), srcParam() }, { retval } );
 }

tests/.expect/attributes.nast.arm64.txt

@@ -1334 +1334 @@
     }
     inline enum __anonymous4 _X16_operator_assignFM12__anonymous4_M12__anonymous4M12__anonymous4_intrinsic___2(enum __anonymous4 *_X4_dstM12__anonymous4_2, enum __anonymous4 _X4_srcM12__anonymous4_2){
-        enum __anonymous4 _X4_retM12__anonymous4_2;
         {
             ((void)((*_X4_dstM12__anonymous4_2)=_X4_srcM12__anonymous4_2));

tests/.expect/attributes.nast.x64.txt

@@ -1334 +1334 @@
     }
     inline enum __anonymous4 _X16_operator_assignFM12__anonymous4_M12__anonymous4M12__anonymous4_intrinsic___2(enum __anonymous4 *_X4_dstM12__anonymous4_2, enum __anonymous4 _X4_srcM12__anonymous4_2){
-        enum __anonymous4 _X4_retM12__anonymous4_2;
         {
             ((void)((*_X4_dstM12__anonymous4_2)=_X4_srcM12__anonymous4_2));

tests/.expect/attributes.nast.x86.txt

@@ -1334 +1334 @@
     }
     inline enum __anonymous4 _X16_operator_assignFM12__anonymous4_M12__anonymous4M12__anonymous4_intrinsic___2(enum __anonymous4 *_X4_dstM12__anonymous4_2, enum __anonymous4 _X4_srcM12__anonymous4_2){
-        enum __anonymous4 _X4_retM12__anonymous4_2;
         {
             ((void)((*_X4_dstM12__anonymous4_2)=_X4_srcM12__anonymous4_2));

tests/.expect/attributes.oast.x64.txt

@@ -1334 +1334 @@
     }
     inline enum __anonymous4 _X16_operator_assignFM12__anonymous4_M12__anonymous4M12__anonymous4_intrinsic___2(enum __anonymous4 *_X4_dstM12__anonymous4_2, enum __anonymous4 _X4_srcM12__anonymous4_2){
-        enum __anonymous4 _X4_retM12__anonymous4_2;
         {
             ((void)((*_X4_dstM12__anonymous4_2)=_X4_srcM12__anonymous4_2));