Changeset b110bcc for src/InitTweak/FixInitNew.cpp

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (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

File:

• src/InitTweak/FixInitNew.cpp (modified) (13 diffs)

src/InitTweak/FixInitNew.cpp

@@ -14 +14 @@
 #include <utility>                     // for pair
 
+#include "AST/DeclReplacer.hpp"
+#include "AST/Expr.hpp"
 #include "AST/Inspect.hpp"             // for getFunction, getPointerBase, g...
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Print.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
 #include "CodeGen/GenType.h"           // for genPrettyType
 #include "CodeGen/OperatorTable.h"
-#include "Common/CodeLocationTools.hpp"
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
 #include "GenInit.h"                   // for genCtorDtor
@@ -28 +34 @@
 #include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "SymTab/Autogen.h"            // for genImplicitCall
+#include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
 #include "SymTab/Indexer.h"            // for Indexer
 #include "SymTab/Mangler.h"            // for Mangler
@@ -45 +52 @@
 #include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 
-#include "AST/Expr.hpp"
-#include "AST/Node.hpp"
-#include "AST/Pass.hpp"
-#include "AST/Print.hpp"
-#include "AST/SymbolTable.hpp"
-#include "AST/Type.hpp"
-#include "AST/DeclReplacer.hpp"
-
 extern bool ctordtorp; // print all debug
 extern bool ctorp; // print ctor debug
@@ -63 +62 @@
 namespace InitTweak {
 namespace {
+
+        // Shallow copy the pointer list for return.
+        std::vector<ast::ptr<ast::TypeDecl>> getGenericParams( const ast::Type * t ) {
+                if ( auto inst = dynamic_cast<const ast::StructInstType *>( t ) ) {
+                        return inst->base->params;
+                }
+                if ( auto inst = dynamic_cast<const ast::UnionInstType *>( t ) ) {
+                        return inst->base->params;
+                }
+                return {};
+        }
+
+        /// Given type T, generate type of default ctor/dtor, i.e. function type void (*) (T &).
+        ast::FunctionDecl * genDefaultFunc(
+                        const CodeLocation loc,
+                        const std::string fname,
+                        const ast::Type * paramType,
+                        bool maybePolymorphic = true) {
+                std::vector<ast::ptr<ast::TypeDecl>> typeParams;
+                if ( maybePolymorphic ) typeParams = getGenericParams( paramType );
+                auto dstParam = new ast::ObjectDecl( loc,
+                        "_dst",
+                        new ast::ReferenceType( paramType ),
+                        nullptr,
+                        {},
+                        ast::Linkage::Cforall
+                );
+                return new ast::FunctionDecl( loc,
+                        fname,
+                        std::move(typeParams),
+                        {dstParam},
+                        {},
+                        new ast::CompoundStmt(loc),
+                        {},
+                        ast::Linkage::Cforall
+                );
+        }
+
         struct SelfAssignChecker {
                 void previsit( const ast::ApplicationExpr * appExpr );
@@ -107 +144 @@
         private:
                 /// hack to implement WithTypeSubstitution while conforming to mutation safety.
-                ast::TypeSubstitution * env;
-                bool                    envModified;
+                ast::TypeSubstitution * env         = nullptr;
+                bool                    envModified = false;
         };
 
@@ -121 +158 @@
                 void previsit( const ast::FunctionDecl * ) { visit_children = false; }
 
-          protected:
+        protected:
                 ObjectSet curVars;
         };
@@ -202 +239 @@
 
                 SemanticErrorException errors;
-          private:
+        private:
                 template< typename... Params >
                 void emit( CodeLocation, const Params &... params );
@@ -288 +325 @@
                 static UniqueName dtorNamer( "__cleanup_dtor" );
                 std::string name = dtorNamer.newName();
-                ast::FunctionDecl * dtorFunc = SymTab::genDefaultFunc( loc, name, objDecl->type->stripReferences(), false );
+                ast::FunctionDecl * dtorFunc = genDefaultFunc( loc, name, objDecl->type->stripReferences(), false );
                 stmtsToAdd.push_back( new ast::DeclStmt(loc, dtorFunc ) );
 
@@ -522 +559 @@
         {
                 static UniqueName tempNamer("_tmp_cp");
-                assert( env );
                 const CodeLocation loc = impCpCtorExpr->location;
                 // CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *env << std::endl; )
@@ -534 +570 @@
 
                 // xxx - this originally mutates arg->result in place. is it correct?
+                assert( env );
                 result = env->applyFree( result.get() ).node;
                 auto mutResult = result.get_and_mutate();
@@ -1080 +1117 @@
         void InsertDtors::previsit( const ast::BranchStmt * stmt ) {
                 switch( stmt->kind ) {
-                  case ast::BranchStmt::Continue:
-                  case ast::BranchStmt::Break:
+                case ast::BranchStmt::Continue:
+                case ast::BranchStmt::Break:
                         // could optimize the break/continue case, because the S_L-S_G check is unnecessary (this set should
                         // always be empty), but it serves as a small sanity check.
-                  case ast::BranchStmt::Goto:
+                case ast::BranchStmt::Goto:
                         handleGoto( stmt );
                         break;
-                  default:
+                default:
                         assert( false );
                 } // switch
@@ -1303 +1340 @@
         }
 
-        template< typename Visitor, typename... Params >
-        void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                SemanticErrorException err( loc, toString( params... ) );
-                v.errors.append( err );
-        }
-
         template< typename... Params >
         void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
-                // toggle warnings vs. errors here.
-                // warn( params... );
-                error( *this, loc, params... );
+                SemanticErrorException err( loc, toString( params... ) );
+                errors.append( err );
         }
 
@@ -1319 +1349 @@
                 // xxx - functions returning ast::ptr seems wrong...
                 auto res = ResolvExpr::findVoidExpression( untypedExpr, { symtab, transUnit().global } );
-                // Fix CodeLocation (at least until resolver is fixed).
-                auto fix = localFillCodeLocations( untypedExpr->location, res.release() );
-                return strict_dynamic_cast<const ast::Expr *>( fix );
+                return res.release();
         }