Changeset 2cb8bf71 for src

Timestamp:

May 30, 2023, 5:35:57 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ast-experimental, master, stuck-waitfor-destruct

Children:

dd3baf4

Parents:

44198fb9 (diff), 8913de4 (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/Pass.impl.hpp (modified) (1 diff)
• AST/Pass.proto.hpp (modified) (1 diff)
• Concurrency/Waituntil.cpp (modified) (3 diffs)
• SymTab/Autogen.h (modified) (2 diffs)
• SymTab/GenImplicitCall.cpp (modified) (2 diffs)
• SymTab/GenImplicitCall.hpp (modified) (2 diffs)
• Validate/Autogen.cpp (modified) (4 diffs)

src/AST/Pass.impl.hpp

@@ -46 +46 @@
 
 #ifdef PEDANTIC_PASS_ASSERT
-#define __pedantic_pass_assert(...) assert (__VA_ARGS__)
+#define __pedantic_pass_assert(...) assert(__VA_ARGS__)
 #define __pedantic_pass_assertf(...) assertf(__VA_ARGS__)
 #else

src/AST/Pass.proto.hpp

@@ -27 +27 @@
 
 #ifdef PEDANTIC_PASS_ASSERT
-#define __pedantic_pass_assert(...) assert (__VA_ARGS__)
+#define __pedantic_pass_assert(...) assert(__VA_ARGS__)
 #define __pedantic_pass_assertf(...) assertf(__VA_ARGS__)
 #else

src/Concurrency/Waituntil.cpp

@@ -940 +940 @@
         }
 
-    // C_TODO: will remove this commented code later. Currently it isn't needed but may switch to a modified version of this later if it has better performance
-    // std::vector<ptr<CaseClause>> switchCases;
-
-    // int idx = 0;
-    // for ( const auto & clause: stmt->clauses ) {
-    //     const CodeLocation & cLoc = clause->location;
-    //     switchCases.push_back(
-    //         new CaseClause( cLoc,
-    //             new CastExpr( cLoc, 
-    //                 new AddressExpr( cLoc, new NameExpr( cLoc, data.at(idx)->targetName ) ),
-    //                 new BasicType( BasicType::Kind::LongUnsignedInt ), GeneratedFlag::ExplicitCast 
-    //             ),
-    //             {
-    //                 new CompoundStmt( cLoc,
-    //                     {
-    //                         ast::deepCopy( clause->stmt ),
-    //                         new BranchStmt( cLoc, BranchStmt::Kind::Break, Label( cLoc ) )
-    //                     }
-    //                 )
-    //             }
-    //         )
-    //     );
-    //     idx++;
-    // }
-
     return new CompoundStmt( loc,
         {
             new ExprStmt( loc, new UntypedExpr( loc, new NameExpr( loc, "park" ) ) ),
             outerIf
-            // new SwitchStmt( loc,
-            //     new NameExpr( loc, statusName ),
-            //     std::move( switchCases )
-            // )
         }
     );
@@ -1015 +986 @@
     const CodeLocation & cLoc = stmt->clauses.at(idx)->location;
 
+    Expr * baseCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" );
     Expr * ifCond;
 
@@ -1025 +997 @@
             ),
             new CastExpr( cLoc,
-                genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" ),
+                baseCond,
                 new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             LogicalFlag::AndExpr
         );
-    } else ifCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" );
+    } else ifCond = baseCond;
 
     return new CompoundStmt( cLoc,

src/SymTab/Autogen.h

@@ -20 +20 @@
 #include <string>                 // for string
 
-#include "AST/Decl.hpp"
-#include "AST/Expr.hpp"
-#include "AST/Init.hpp"
-#include "AST/Node.hpp"
-#include "AST/Stmt.hpp"
-#include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/UniqueName.h"    // for UniqueName
@@ -57 +51 @@
         /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
         FunctionType * genCopyType( Type * paramType, bool maybePolymorphic = true );
-
-        /// Enum for loop direction
-        enum LoopDirection { LoopBackward, LoopForward };
 
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.

src/SymTab/GenImplicitCall.cpp

@@ -16 +16 @@
 #include "GenImplicitCall.hpp"
 
+#include "AST/Decl.hpp"                  // for ObjectDecl
+#include "AST/Expr.hpp"                  // for ConstantExpr, UntypedExpr,...
+#include "AST/Init.hpp"                  // for SingleInit
 #include "AST/Inspect.hpp"               // for isUnnamedBitfield
+#include "AST/Stmt.hpp"                  // for ExprStmt
+#include "AST/Type.hpp"                  // for ArrayType, BasicType, ...
 #include "CodeGen/OperatorTable.h"       // for isCtorDtor
 #include "Common/UniqueName.h"           // for UniqueName
 
 namespace SymTab {
+
+namespace {
 
 template< typename OutIter >
@@ -173 +180 @@
 }
 
+} // namespace
+
 ast::ptr< ast::Stmt > genImplicitCall(
         InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,

src/SymTab/GenImplicitCall.hpp

@@ -17 +17 @@
 
 #include "InitTweak/InitTweak.h"  // for InitExpander
-#include "SymTab/Autogen.h"       // for LoopDirection
 
 namespace SymTab {
 
+/// Enum for loop direction
+enum LoopDirection { LoopBackward, LoopForward };
+
+/// Returns a generated call expression to function fname with srcParam and
+/// dstParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
 ast::ptr<ast::Stmt> genImplicitCall(
         InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
@@ -34 +38 @@
 // compile-command: "make install" //
 // End: //
-

src/Validate/Autogen.cpp

@@ -44 +44 @@
 #include "CompilationState.h"
 
-// TODO: The other new ast function should be moved over to this file.
-#include "SymTab/Autogen.h"
-
 namespace Validate {
 
@@ -96 +93 @@
 
         const CodeLocation& getLocation() const { return getDecl()->location; }
-        ast::FunctionDecl * genProto( const std::string& name,
+        ast::FunctionDecl * genProto( std::string&& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const;
@@ -337 +334 @@
 }
 
+void replaceAll( std::vector<ast::ptr<ast::DeclWithType>> & dwts,
+                const ast::DeclReplacer::TypeMap & map ) {
+        for ( auto & dwt : dwts ) {
+                dwt = strict_dynamic_cast<const ast::DeclWithType *>(
+                                ast::DeclReplacer::replace( dwt, map ) );
+        }
+}
+
 /// Generates a basic prototype function declaration.
-ast::FunctionDecl * FuncGenerator::genProto( const std::string& name,
+ast::FunctionDecl * FuncGenerator::genProto( std::string&& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const {
@@ -344 +349 @@
         // Handle generic prameters and assertions, if any.
         auto const & old_type_params = getGenericParams( type );
+        ast::DeclReplacer::TypeMap oldToNew;
         std::vector<ast::ptr<ast::TypeDecl>> type_params;
         std::vector<ast::ptr<ast::DeclWithType>> assertions;
         for ( auto & old_param : old_type_params ) {
                 ast::TypeDecl * decl = ast::deepCopy( old_param );
-                for ( auto assertion : decl->assertions ) {
-                        assertions.push_back( assertion );
-                }
-                decl->assertions.clear();
+                decl->init = nullptr;
+                splice( assertions, decl->assertions );
+                oldToNew.emplace( std::make_pair( old_param, decl ) );
                 type_params.push_back( decl );
         }
-        // TODO: The values in params and returns still may point at the old
-        // generic params, that does not appear to be an issue but perhaps it
-        // should be addressed.
+        replaceAll( params, oldToNew );
+        replaceAll( returns, oldToNew );
+        replaceAll( assertions, oldToNew );
 
         ast::FunctionDecl * decl = new ast::FunctionDecl(
                 // Auto-generated routines use the type declaration's location.
                 getLocation(),
-                name,
+                std::move( name ),
                 std::move( type_params ),
                 std::move( assertions ),