Changeset 4c2e561 for src

Timestamp:

Jul 4, 2023, 4:29:10 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

3430ce8

Parents:

3397eed (diff), 7f1be01 (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:

• Common/ScopedMap.h (modified) (3 diffs)
• Concurrency/KeywordsNew.cpp (modified) (2 diffs)
• GenPoly/ErasableScopedMap.h (modified) (2 diffs)
• GenPoly/ScopedSet.h (modified) (8 diffs)
• SymTab/FixFunction.cc (modified) (2 diffs)

src/Common/ScopedMap.h

@@ -199 +199 @@
         friend class ScopedMap;
         friend class const_iterator;
-        typedef typename ScopedMap::MapType::iterator wrapped_iterator;
-        typedef typename ScopedMap::ScopeList scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename MapType::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -220 +219 @@
         }
 
-        iterator(scope_list & _scopes, const wrapped_iterator & _it, size_type inLevel)
+        iterator(ScopeList & _scopes, const wrapped_iterator & _it, size_type inLevel)
                 : scopes(&_scopes), it(_it), level(inLevel) {}
 public:
@@ -266 +265 @@
 
 private:
-        scope_list *scopes;
+        ScopeList *scopes;
         wrapped_iterator it;
         size_type level;

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/GenPoly/ErasableScopedMap.h

@@ -57 +57 @@
         /// Starts a new scope
         void beginScope() {
-                Scope scope;
-                scopes.push_back(scope);
+                scopes.emplace_back();
         }
 
@@ -145 +144 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ErasableScopedMap;
-        typedef typename std::map< Key, Value >::iterator wrapped_iterator;
-        typedef typename std::vector< std::map< Key, Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item

src/GenPoly/ScopedSet.h

@@ -47 +47 @@
         /// Starts a new scope
         void beginScope() {
-                Scope scope;
-                scopes.push_back(scope);
+                scopes.emplace_back();
         }
 
@@ -85 +84 @@
         iterator findNext( const_iterator &it, const Value &key ) {
                 if ( it.i == 0 ) return end();
-                        for ( size_type i = it.i - 1; ; --i ) {
+                for ( size_type i = it.i - 1; ; --i ) {
                         typename Scope::iterator val = scopes[i].find( key );
                         if ( val != scopes[i].end() ) return iterator( scopes, val, i );
@@ -112 +111 @@
         friend class ScopedSet;
         friend class const_iterator;
-        typedef typename std::set< Value >::iterator wrapped_iterator;
-        typedef typename std::vector< std::set< Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -133 +131 @@
         }
 
-        iterator(scope_list const &_scopes, const wrapped_iterator &_it, size_type _i)
+        iterator(ScopeList const &_scopes, const wrapped_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -176 +174 @@
 
 private:
-        scope_list const *scopes;
+        ScopeList const *scopes;
         wrapped_iterator it;
         size_type i;
@@ -185 +183 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ScopedSet;
-        typedef typename std::set< Value >::iterator wrapped_iterator;
-        typedef typename std::set< Value >::const_iterator wrapped_const_iterator;
-        typedef typename std::vector< std::set< Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename Scope::const_iterator wrapped_const_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -207 +204 @@
         }
 
-        const_iterator(scope_list const &_scopes, const wrapped_const_iterator &_it, size_type _i)
+        const_iterator(ScopeList const &_scopes, const wrapped_const_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -255 +252 @@
 
 private:
-        scope_list const *scopes;
+        ScopeList const *scopes;
         wrapped_const_iterator it;
         size_type i;

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 };
                 }