Changeset 295dd61 for src

Timestamp:

Dec 6, 2021, 5:06:14 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

75873cf

Parents:

813dfd86 (diff), a83012bf (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.hpp (modified) (1 diff)
• AST/Expr.cpp (modified) (2 diffs)
• AST/Print.cpp (modified) (1 diff)
• AST/Print.hpp (modified) (2 diffs)
• Concurrency/Keywords.cc (modified) (1 diff)
• Concurrency/Keywords.h (modified) (3 diffs)
• Concurrency/KeywordsNew.cpp (added)
• Concurrency/module.mk (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• InitTweak/InitTweak.h (modified) (2 diffs)
• Validate/CompoundLiteral.cpp (added)
• Validate/CompoundLiteral.hpp (added)
• Validate/module.mk (modified) (1 diff)
• main.cc (modified) (6 diffs)

src/AST/Decl.hpp

@@ -270 +270 @@
         : AggregateDecl( loc, name, std::move(attrs), linkage ), kind( kind ) {}
 
-        bool is_coroutine() { return kind == Coroutine; }
-        bool is_generator() { return kind == Generator; }
-        bool is_monitor  () { return kind == Monitor  ; }
-        bool is_thread   () { return kind == Thread   ; }
+        bool is_coroutine() const { return kind == Coroutine; }
+        bool is_generator() const { return kind == Generator; }
+        bool is_monitor  () const { return kind == Monitor  ; }
+        bool is_thread   () const { return kind == Thread   ; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Expr.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May 15 17:00:00 2019
-// Last Modified By : Peter A. Buhr
-// Created On       : Thr Jun 13 13:38:00 2019
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Created On       : Tue Nov 30 14:23:00 2021
+// Update Count     : 7
 //
 
@@ -141 +141 @@
         /// The type of the address of a type.
         /// Caller is responsible for managing returned memory
-        Type * addrType( const Type * type ) {
-                if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * >( type ) ) {
-                        return new ReferenceType{ addrType( refType->base ), refType->qualifiers };
+        Type * addrType( const ptr<Type> & type ) {
+                if ( auto refType = type.as< ReferenceType >() ) {
+                        return new ReferenceType( addrType( refType->base ), refType->qualifiers );
                 } else {
-                        return new PointerType{ type };
+                        return new PointerType( type );
                 }
         }
-}
-
-AddressExpr::AddressExpr( const CodeLocation & loc, const Expr * a ) : Expr( loc ), arg( a ) {
-        if ( arg->result ) {
-                if ( arg->get_lvalue() ) {
-                        // lvalue, retains all levels of reference, and gains a pointer inside the references
-                        Type * res = addrType( arg->result );
-                        result = res;
+
+        /// The type of the address of an expression.
+        /// Caller is responsible for managing returned memory
+        Type * addrExprType( const CodeLocation & loc, const Expr * arg ) {
+                assert( arg );
+                // If the expression's type is unknown, the address type is unknown.
+                if ( nullptr == arg->result ) {
+                        return nullptr;
+                // An lvalue is transformed directly.
+                } else if ( arg->get_lvalue() ) {
+                        return addrType( arg->result );
+                // Strip a layer of reference to "create" an lvalue expression.
+                } else if ( auto refType = arg->result.as< ReferenceType >() ) {
+                        return addrType( refType->base );
                 } else {
-                        // taking address of non-lvalue, must be a reference, loses one layer of reference
-                        if ( const ReferenceType * refType =
-                                        dynamic_cast< const ReferenceType * >( arg->result.get() ) ) {
-                                Type * res = addrType( refType->base );
-                                result = res;
-                        } else {
-                                SemanticError( loc, arg->result.get(),
-                                        "Attempt to take address of non-lvalue expression: " );
-                        }
+                        SemanticError( loc, arg->result.get(),
+                                "Attempt to take address of non-lvalue expression: " );
                 }
         }
 }
+
+AddressExpr::AddressExpr( const CodeLocation & loc, const Expr * a ) :
+        Expr( loc, addrExprType( loc, a ) ), arg( a )
+{}
 
 // --- LabelAddressExpr

src/AST/Print.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Print.cpp --
+// Print.cpp -- Print an AST (or sub-tree) to a stream.
 //
 // Author           : Thierry Delisle

src/AST/Print.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Print.hpp --
+// Print.hpp -- Print an AST (or sub-tree) to a stream.
 //
 // Author           : Thierry Delisle
@@ -35 +35 @@
 template< typename Coll >
 void printAll( std::ostream & os, const Coll & c, Indenter indent = {} ) {
-    for ( const auto & i : c ) {
-        if ( ! i ) continue;
-        
-        os << indent;
-        print( os, i, indent );
-        os << std::endl;
-    }
+        for ( const auto & i : c ) {
+                if ( ! i ) continue;
+
+                os << indent;
+                print( os, i, indent );
+                os << std::endl;
+        }
 }
 

src/Concurrency/Keywords.cc

@@ -979 +979 @@
                         // If this is the destructor for a monitor it must be mutex
                         if(isDtor) {
+                                // This reflects MutexKeyword::validate, except does not produce an error.
                                 Type* ty = decl->get_functionType()->get_parameters().front()->get_type();
 

src/Concurrency/Keywords.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Keywords.h --
+// Keywords.h -- Implement concurrency constructs from their keywords.
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace Concurrency {
@@ -24 +27 @@
         void implementMutexFuncs( std::list< Declaration * > & translationUnit );
         void implementThreadStarter( std::list< Declaration * > & translationUnit );
+
+/// Implement the sue-like keywords and the suspend keyword.
+void implementKeywords( ast::TranslationUnit & translationUnit );
+/// Implement the mutex parameters and mutex statement.
+void implementMutex( ast::TranslationUnit & translationUnit );
+/// Add the thread starter code to constructors.
+void implementThreadStarter( ast::TranslationUnit & translationUnit );
 };
 

src/Concurrency/module.mk

@@ -15 +15 @@
 ###############################################################################
 
-SRC += Concurrency/Keywords.cc Concurrency/Keywords.h Concurrency/Waitfor.cc Concurrency/Waitfor.h
-SRCDEMANGLE += Concurrency/Keywords.cc
+SRC_CONCURRENCY = \
+        Concurrency/KeywordsNew.cpp \
+        Concurrency/Keywords.cc
 
+SRC += $(SRC_CONCURRENCY) \
+        Concurrency/Keywords.h \
+        Concurrency/Waitfor.cc \
+        Concurrency/Waitfor.h
+
+SRCDEMANGLE += $(SRC_CONCURRENCY)
+

src/InitTweak/InitTweak.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 16 20:57:22 2021
-// Update Count     : 18
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Nov 19 19:22:00 2021
+// Update Count     : 19
 //
 
@@ -540 +540 @@
         }
 
+        const ast::Type * getTypeofThis( const ast::FunctionType * ftype ) {
+                assertf( ftype, "getTypeofThis: nullptr ftype" );
+                const std::vector<ast::ptr<ast::Type>> & params = ftype->params;
+                assertf( !params.empty(), "getTypeofThis: ftype with 0 parameters: %s",
+                                toString( ftype ).c_str() );
+                const ast::ReferenceType * refType =
+                        params.front().strict_as<ast::ReferenceType>();
+                return refType->base;
+        }
+
         ObjectDecl * getParamThis( FunctionType * ftype ) {
                 assertf( ftype, "getParamThis: nullptr ftype" );

src/InitTweak/InitTweak.h

@@ -10 +10 @@
 // Created On       : Fri May 13 11:26:36 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 19 14:18:00 2019
-// Update Count     : 6
+// Last Modified On : Fri Nov 19 14:18:00 2021
+// Update Count     : 7
 //
 
@@ -35 +35 @@
         /// returns the base type of the first parameter to a constructor/destructor/assignment function
         Type * getTypeofThis( FunctionType * ftype );
+        const ast::Type * getTypeofThis( const ast::FunctionType * ftype );
 
         /// returns the first parameter of a constructor/destructor/assignment function

src/Validate/module.mk

@@ -16 +16 @@
 
 SRC_VALIDATE = \
+        Validate/CompoundLiteral.cpp \
+        Validate/CompoundLiteral.hpp \
         Validate/HandleAttributes.cc \
         Validate/HandleAttributes.h \

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Nov 12 11:06:00 2021
-// Update Count     : 658
+// Last Modified On : Tue Nov 30 10:25:00 2021
+// Update Count     : 659
 //
 
@@ -50 +50 @@
 #include "Common/UnimplementedError.h"      // for UnimplementedError
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
+#include "Concurrency/Keywords.h"           // for implementMutex, implement...
 #include "Concurrency/Waitfor.h"            // for generateWaitfor
 #include "ControlStruct/ExceptDecl.h"       // for translateExcept
@@ -73 +74 @@
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
+#include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
@@ -325 +327 @@
                 PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
                 PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
-                PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -338 +339 @@
                         forceFillCodeLocations( transUnit );
 
+                        PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
+                        PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );
+                        PASS( "Compound Literal", Validate::handleCompoundLiterals( transUnit ) );
                         PASS( "Set Length From Initializer", Validate::setLengthFromInitializer( transUnit ) );
                         PASS( "Find Global Decls", Validate::findGlobalDecls( transUnit ) );
@@ -402 +406 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
                         PASS( "Validate-F", SymTab::validate_F( translationUnit ) );