Changeset 37273c8 for src/InitTweak

Timestamp:

Nov 28, 2023, 3:01:52 PM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

ab9c1b3

Parents:

4bc4b4c

Message:

Removed the old-ast-compatable FunctionDecl? constructor. However, enough cases pass nothing polymorphic along some of the uses of the constructor now go to a new monomorphic function constructor.

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (2 diffs)
• FixInitNew.cpp (modified) (2 diffs)
• InitTweak.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -84 +84 @@
                 if (inLibrary) ctorParams.emplace_back(ast::ConstantExpr::from_int(location, 200));
                 auto initFunction = new ast::FunctionDecl(location,
-                        "__global_init__", {}, {}, {},
+                        "__global_init__", {}, {}, {}, {},
                         new ast::CompoundStmt(location, std::move(fixer.core.initStmts)),
                         ast::Storage::Static, ast::Linkage::C,
@@ -96 +96 @@
                 if (inLibrary) dtorParams.emplace_back(ast::ConstantExpr::from_int(location, 200));
                 auto destroyFunction = new ast::FunctionDecl( location,
-                        "__global_destroy__", {}, {}, {},
+                        "__global_destroy__", {}, {}, {}, {},
                         new ast::CompoundStmt(location, std::move(fixer.core.destroyStmts)),
                         ast::Storage::Static, ast::Linkage::C,

src/InitTweak/FixInitNew.cpp

@@ -74 +74 @@
                 fname,
                 std::move(typeParams),
+                {},
                 {dstParam},
                 {},
@@ -899 +900 @@
 
                                         // void __objName_dtor_atexitN(...) {...}
-                                        ast::FunctionDecl * dtorCaller = new ast::FunctionDecl(loc, objDecl->mangleName + dtorCallerNamer.newName(), {}, {}, {}, new ast::CompoundStmt(loc, {dtor}), ast::Storage::Static, ast::Linkage::C );
+                                        ast::FunctionDecl * dtorCaller = new ast::FunctionDecl(loc, objDecl->mangleName + dtorCallerNamer.newName(), {}, {}, {}, {}, new ast::CompoundStmt(loc, {dtor}), ast::Storage::Static, ast::Linkage::C );
                                         dtorCaller->fixUniqueId();
                                         // dtorCaller->stmts->push_back( dtor );

src/InitTweak/InitTweak.cc

@@ -342 +342 @@
         if (!assign) {
                 auto td = new ast::TypeDecl(CodeLocation(), "T", {}, nullptr, ast::TypeDecl::Dtype, true);
-                assign = new ast::FunctionDecl(CodeLocation(), "?=?", {td},
+                assign = new ast::FunctionDecl(CodeLocation(), "?=?", {td}, {},
                 { new ast::ObjectDecl(CodeLocation(), "_dst", new ast::ReferenceType(new ast::TypeInstType("T", td))),
                   new ast::ObjectDecl(CodeLocation(), "_src", new ast::TypeInstType("T", td))},