Changeset 454b4e0 for src

Timestamp:

Feb 9, 2022, 10:59:11 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6a823241

Parents:

12b5e94a (diff), a986807 (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.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (5 diffs)
• Common/CodeLocation.h (modified) (2 diffs)
• ControlStruct/MLEMutator.cc (modified) (1 diff)
• Makefile.am (modified) (2 diffs)

src/AST/Pass.hpp

@@ -265 +265 @@
         result1<ast::Stmt> call_accept_as_compound(const ast::Stmt *);
 
-        template<typename it_t, template <class...> class container_t>
-                static inline void take_all_delta( it_t it, container_t<ast::ptr<ast::Decl>> * decls, bool * mutated = nullptr ) {
-                        if(empty(decls)) return;
-
-                        std::transform(decls->begin(), decls->end(), it, [](ast::ptr<ast::Decl>&& decl) -> auto {
-                                        auto loc = decl->location;
-                                        auto stmt = new DeclStmt( loc, decl.release() );
-                                        return { {stmt}, -1, false };
-                                });
-                        decls->clear();
-                        if(mutated) *mutated = true;
-                }
-
         // Container of statements
         template< template <class...> class container_t >

src/AST/Pass.impl.hpp

@@ -160 +160 @@
 
         template< typename core_t >
-        ast::Pass< core_t >::result1<ast::Expr> ast::Pass< core_t >::call_accept( const ast::Expr * expr ) {
+        typename ast::Pass< core_t >::template result1<ast::Expr> ast::Pass< core_t >::call_accept( const ast::Expr * expr ) {
                 __pedantic_pass_assert( __visit_children() );
                 __pedantic_pass_assert( expr );
@@ -174 +174 @@
 
         template< typename core_t >
-        ast::Pass< core_t >::result1<ast::Stmt> ast::Pass< core_t >::call_accept( const ast::Stmt * stmt ) {
+        typename ast::Pass< core_t >::template result1<ast::Stmt> ast::Pass< core_t >::call_accept( const ast::Stmt * stmt ) {
                 __pedantic_pass_assert( __visit_children() );
                 __pedantic_pass_assert( stmt );
@@ -183 +183 @@
 
         template< typename core_t >
-        ast::Pass< core_t >::result1<ast::Stmt> ast::Pass< core_t >::call_accept_as_compound( const ast::Stmt * stmt ) {
+        typename ast::Pass< core_t >::template result1<ast::Stmt> ast::Pass< core_t >::call_accept_as_compound( const ast::Stmt * stmt ) {
                 __pedantic_pass_assert( __visit_children() );
                 __pedantic_pass_assert( stmt );
@@ -258 +258 @@
         template< typename core_t >
         template< template <class...> class container_t >
-        ast::Pass< core_t >::resultNstmt<container_t> ast::Pass< core_t >::call_accept( const container_t< ptr<Stmt> > & statements ) {
+        typename ast::Pass< core_t >::template resultNstmt<container_t> ast::Pass< core_t >::call_accept( const container_t< ptr<Stmt> > & statements ) {
                 __pedantic_pass_assert( __visit_children() );
                 if( statements.empty() ) return {};
@@ -346 +346 @@
         template< typename core_t >
         template< template <class...> class container_t, typename node_t >
-        ast::Pass< core_t >::resultN<container_t, node_t> ast::Pass< core_t >::call_accept( const container_t< ast::ptr<node_t> > & container ) {
+        typename ast::Pass< core_t >::template resultN<container_t, node_t> ast::Pass< core_t >::call_accept( const container_t< ast::ptr<node_t> > & container ) {
                 __pedantic_pass_assert( __visit_children() );
                 if( container.empty() ) return {};

src/Common/CodeLocation.h

@@ -26 +26 @@
         CodeLocation() = default;
 
+
         /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
@@ -33 +34 @@
 
         CodeLocation( const CodeLocation& rhs ) = default;
+        CodeLocation( CodeLocation&& rhs ) = default;
+        CodeLocation& operator=( const CodeLocation & ) = default;
+        CodeLocation& operator=( CodeLocation && ) = default;
 
         bool isSet () const {

src/ControlStruct/MLEMutator.cc

@@ -66 +66 @@
 
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
-        // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
+        // through the breakLabel field that they need a place to jump to on a break statement, add the break label to the
         // body of statements
         void MultiLevelExitMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {

src/Makefile.am

@@ -59 +59 @@
 
 $(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
-        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
+        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra -Werror=return-type
         @./BasicTypes-gen
         @rm BasicTypes-gen
@@ -71 +71 @@
 EXTRA_DIST = include/cassert include/optional BasicTypes-gen.cc
 
-AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -Werror=return-type -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
 ARFLAGS     = cr