Changeset 7f2bfb7 for src

Timestamp:

Nov 29, 2023, 1:41:52 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

4dc3b8c

Parents:

4f1b2d69 (diff), ab9c1b3 (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:

• AST/Decl.cpp (modified) (1 diff)
• AST/Decl.hpp (modified) (1 diff)
• Concurrency/Actors.cpp (modified) (6 diffs)
• Concurrency/Corun.cpp (modified) (2 diffs)
• Concurrency/KeywordsNew.cpp (modified) (4 diffs)
• Concurrency/Waituntil.cpp (modified) (2 diffs)
• ControlStruct/ExceptTranslateNew.cpp (modified) (5 diffs)
• InitTweak/FixGlobalInit.cc (modified) (2 diffs)
• InitTweak/FixInitNew.cpp (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• ResolvExpr/CurrentObject.cc (modified) (2 diffs)
• Virtual/Tables.cc (modified) (1 diff)
• Virtual/VirtualDtor.cpp (modified) (2 diffs)

src/AST/Decl.cpp

@@ -41 +41 @@
 
 FunctionDecl::FunctionDecl( const CodeLocation & loc, const std::string & name,
-        std::vector<ptr<TypeDecl>>&& forall,
         std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
         CompoundStmt * stmts, Storage::Classes storage, Linkage::Spec linkage,
         std::vector<ptr<Attribute>>&& attrs, Function::Specs fs, ArgumentFlag isVarArgs )
-: DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ),
-        type_params(std::move(forall)), assertions(),
-        params(std::move(params)), returns(std::move(returns)), stmts( stmts ) {
-        FunctionType * ftype = new FunctionType( isVarArgs );
-        for (auto & param : this->params) {
-                ftype->params.emplace_back(param->get_type());
-        }
-        for (auto & ret : this->returns) {
-                ftype->returns.emplace_back(ret->get_type());
-        }
-        for (auto & tp : this->type_params) {
-                ftype->forall.emplace_back(new TypeInstType(tp));
-                for (auto & ap: tp->assertions) {
-                        ftype->assertions.emplace_back(new VariableExpr(loc, ap));
-                }
-        }
-        this->type = ftype;
+: FunctionDecl( loc, name, {}, {}, std::move(params), std::move(returns),
+                stmts, storage, linkage, std::move(attrs), fs, isVarArgs ) {
 }
 

src/AST/Decl.hpp

@@ -135 +135 @@
         std::vector< ptr<Expr> > withExprs;
 
-        // The difference between the two constructors is in how they handle
-        // assertions. The first constructor uses the assertions from the type
-        // parameters, in the style of the old ast, and puts them on the type.
-        // The second takes an explicite list of assertions and builds a list of
-        // references to them on the type.
-
-        FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,
+        /// Monomorphic Function Constructor:
+        FunctionDecl( const CodeLocation & locaction, const std::string & name,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
                 CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {}, ArgumentFlag isVarArgs = FixedArgs );
 
+        /// Polymorphic Function Constructor:
         FunctionDecl( const CodeLocation & location, const std::string & name,
                 std::vector<ptr<TypeDecl>>&& forall, std::vector<ptr<DeclWithType>>&& assertions,

src/Concurrency/Actors.cpp

@@ -265 +265 @@
                 decl->location,
                 "__CFA_receive_wrap",
-                {},                     // forall
                 {
                     new ObjectDecl(
@@ -288 +287 @@
                     )
                 },                      // params
-                { 
+                {
                     new ObjectDecl(
                         decl->location,
@@ -400 +399 @@
                                 )
                         ));
-            
+
             // Generates: return receiver;
             sendBody->push_back( new ReturnStmt( decl->location, new NameExpr( decl->location, "receiver" ) ) );
@@ -408 +407 @@
                 decl->location,
                 "?|?",
-                {},                     // forall
                 {
                     new ObjectDecl(
@@ -421 +419 @@
                     )
                 },                      // params
-                { 
+                {
                     new ObjectDecl(
                         decl->location,
@@ -434 +432 @@
                 { Function::Inline }
             );
-            
+
             // forward decls to resolve use before decl problem for '|' routines
             forwardDecls.insertDecl( *actorIter, *messageIter , ast::deepCopy( sendOperatorFunction ) );

src/Concurrency/Corun.cpp

@@ -113 +113 @@
             new FunctionDecl( loc,
                 fnName,                                             // name
-                {},                                                 // forall
                 {
                     new ObjectDecl( loc,
@@ -261 +260 @@
             new FunctionDecl( loc,
                 fnName,                                             // name
-                {},                                                 // forall
                 {},                                                 // params
                 {},                                                 // return

src/Concurrency/KeywordsNew.cpp

@@ -482 +482 @@
                 location,
                 getter_name,
-                {}, // forall
                 { this_decl }, // params
                 { ret_decl }, // returns
@@ -499 +498 @@
                         location,
                         "main",
-                        {},
                         { ast::deepCopy( this_decl ) },
                         {},
@@ -575 +573 @@
                 location,
                 "lock",
-                { /* forall */ },
                 {
                         // Copy the declaration of this.
@@ -607 +604 @@
                 location,
                 "unlock",
-                { /* forall */ },
                 {
                         // Last use, consume the declaration of this.

src/Concurrency/Waituntil.cpp

@@ -553 +553 @@
     return new FunctionDecl( loc,
         predName,
-        {},                     // forall
         {
             new ObjectDecl( loc,
@@ -560 +559 @@
             )
         },
-        { 
+        {
             new ObjectDecl( loc,
                 "sat_ret",

src/ControlStruct/ExceptTranslateNew.cpp

@@ -253 +253 @@
                 location,
                 "try",
-                {}, //forall
                 {}, //no param
                 {}, //no return
@@ -267 +266 @@
                 location,
                 "catch",
-                {}, //forall
                 { make_index_object( location ), make_exception_object( location ) },
                 {}, //return void
@@ -281 +279 @@
                 location,
                 "match",
-                {}, //forall
                 { make_exception_object( location ) },
                 { make_unused_index_object( location ) },
@@ -295 +292 @@
                 location,
                 "handle",
-                {}, //forall
                 { make_exception_object( location ) },
                 { make_bool_object( location ) },
@@ -309 +305 @@
                 location,
                 "finally",
-                {}, //forall
                 { make_voidptr_object( location ) },
                 {}, //return void

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))},

src/Makefile.am

@@ -72 +72 @@
 
 cfa_cpplib_PROGRAMS += $(DEMANGLER)
-EXTRA_PROGRAMS = demangler
-demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
-demangler_LDADD = libdemangle.a -ldl                    # yywrap
+EXTRA_PROGRAMS = ../driver/demangler
+___driver_demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
+___driver_demangler_LDADD = libdemangle.a -ldl                  # yywrap
 noinst_LIBRARIES = $(LIBDEMANGLE)
 EXTRA_LIBRARIES = libdemangle.a

src/ResolvExpr/CurrentObject.cc

@@ -498 +498 @@
                 PRINT( std::cerr << "____untyped: " << expr << std::endl; )
                 auto dit = desigAlts.begin();
+                auto nexpr = dynamic_cast< const NameExpr * >( expr );
 
                 for ( const Type * t : curTypes ) {
                         assert( dit != desigAlts.end() );
                         DesignatorChain & d = *dit;
-                        if ( auto nexpr = dynamic_cast< const NameExpr *>( expr ) ) {
+                        // Name Designation:
+                        if ( nexpr ) {
                                 PRINT( std::cerr << "____actual: " << t << std::endl; )
                                 if ( auto refType = dynamic_cast< const BaseInstType * >( t ) ) {
@@ -515 +517 @@
                                                 }
                                         }
-                                } else if ( auto at = dynamic_cast< const ArrayType * >( t ) ) {
-                                        auto nexpr = dynamic_cast< const NameExpr *>( expr );
-                                        for ( const Decl * mem : refType->lookup( nexpr->name ) ) {
-                                                if ( auto field = dynamic_cast< const ObjectDecl * >( mem ) ) {
-                                                        DesignatorChain d2 = d;
-                                                        d2.emplace_back( new VariableExpr{ expr->location, field } );
-                                                        newDesigAlts.emplace_back( std::move( d2 ) );
-                                                        newTypes.emplace_back( at->base );
-                                                }
-                                        }
                                 }
 
                                 ++dit;
+                        // Index Designation:
                         } else {
                                 if ( auto at = dynamic_cast< const ArrayType * >( t ) ) {

src/Virtual/Tables.cc

@@ -165 +165 @@
                 location,
                 functionName,
-                { /* forall */ },
                 { new ast::ObjectDecl(
                         location,

src/Virtual/VirtualDtor.cpp

@@ -248 +248 @@
             decl->location,
             "__CFA_set_dtor",
-            {},                     // forall
             {
                 new ObjectDecl(
@@ -320 +319 @@
             decl->location,
             "delete",
-            {},                     // forall
             {
                 new ObjectDecl(