Changeset b2ecd48

Timestamp:

Jul 4, 2023, 2:10:54 PM (11 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

7f1be01

Parents:

0ec4eb0

Message:

Changes related to invariant checking scoping, it is not ready by these are unlikely to change.

Location:

src

Files:

• Concurrency/KeywordsNew.cpp (modified) (2 diffs)
• SymTab/FixFunction.cc (modified) (2 diffs)

src/Concurrency/KeywordsNew.cpp

@@ -534 +534 @@
 void ConcurrentSueKeyword::addGetRoutines(
                 const ast::ObjectDecl * field, const ast::FunctionDecl * forward ) {
+        // Clone the signature and then build the body.
+        ast::FunctionDecl * decl = ast::deepCopy( forward );
+
         // Say it is generated at the "same" places as the forward declaration.
-        const CodeLocation & location = forward->location;
-
-        const ast::DeclWithType * param = forward->params.front();
+        const CodeLocation & location = decl->location;
+
+        const ast::DeclWithType * param = decl->params.front();
         ast::Stmt * stmt = new ast::ReturnStmt( location,
                 new ast::AddressExpr( location,
@@ -551 +554 @@
         );
 
-        ast::FunctionDecl * decl = ast::deepCopy( forward );
         decl->stmts = new ast::CompoundStmt( location, { stmt } );
         declsToAddAfter.push_back( decl );

src/SymTab/FixFunction.cc

@@ -109 +109 @@
 
                 const ast::DeclWithType * postvisit( const ast::FunctionDecl * func ) {
-                        return new ast::ObjectDecl{ 
-                                func->location, func->name, new ast::PointerType{ func->type }, nullptr, 
+                        // Cannot handle cases with asserions.
+                        assert( func->assertions.empty() );
+                        return new ast::ObjectDecl{
+                                func->location, func->name, new ast::PointerType( func->type ), nullptr,
                                 func->storage, func->linkage, nullptr, copy( func->attributes ) };
                 }
@@ -117 +119 @@
 
                 const ast::Type * postvisit( const ast::ArrayType * array ) {
-                        return new ast::PointerType{ 
-                                array->base, array->dimension, array->isVarLen, array->isStatic, 
+                        return new ast::PointerType{
+                                array->base, array->dimension, array->isVarLen, array->isStatic,
                                 array->qualifiers };
                 }