Changeset 81da3da4 for src/InitTweak

Timestamp:

Dec 11, 2023, 4:18:13 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (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/InitTweak

Files:

• FixGlobalInit.cc (modified) (2 diffs)
• FixInit.cpp (moved) (moved from src/InitTweak/FixInitNew.cpp ) (2 diffs)
• InitTweak.cc (modified) (1 diff)
• module.mk (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/FixInit.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))},

src/InitTweak/module.mk

@@ -24 +24 @@
         InitTweak/FixGlobalInit.cc \
         InitTweak/FixGlobalInit.h \
-        InitTweak/FixInit.h \
-        InitTweak/FixInitNew.cpp
+        InitTweak/FixInit.cpp \
+        InitTweak/FixInit.h
 
 SRCDEMANGLE += $(SRC_INITTWEAK)