Changeset f5e81d1

Timestamp:

Sep 8, 2016, 4:50:55 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

add7117

Parents:

cd14861 (diff), 4563a95 (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' into tuples

Location:

src

Files:

• Common/utility.h (modified) (8 diffs)
• InitTweak/InitTweak.cc (modified) (5 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)
• SymTab/Indexer.cc (modified) (2 diffs)

src/Common/utility.h

@@ -18 +18 @@
 
 #include <cctype>
+#include <algorithm>
 #include <iostream>
 #include <iterator>
@@ -111 +112 @@
                 return tmp;
         } // if
-}
-
-template< class T, typename ResultType, ResultType( T::* memfunc )() >
-ResultType dispatch( T *pT ) {
-        return (pT->*memfunc)();
 }
 
@@ -162 +158 @@
 }
 
-template< class Constructed, typename Arg >
-Constructed *ctor( Arg arg ) {
-        Constructed *c = new Constructed( arg );
-        return c;
-}
-
-template< class Constructed, typename Arg >
-Constructed ctor_noptr( Arg arg ) {
-        return Constructed( arg );
-}
-
 template< typename T >
 void replace( std::list< T > &org, typename std::list< T >::iterator pos, std::list< T > &with ) {
@@ -185 +170 @@
 }
 
-template< typename T1, typename T2 >
-T2 *cast_ptr( T1 *from ) {
-        return dynamic_cast< T2 * >( from );
-}
-
-template< class Exception, typename Arg >
-void inline assert_throw( bool pred, Arg arg ) {
-        if (pred) throw Exception( arg );
-}
-
-template< typename T >
-struct is_null_pointer {
-        bool operator()( const T *ptr ) { return ( ptr == 0 ); }
-};
-
-template< class InputIterator, class OutputIterator, class Predicate >
-void filter(InputIterator begin, InputIterator end, OutputIterator out, Predicate pred) {
-        while ( begin++ != end )
-                if ( pred(*begin) ) *out++ = *begin;
-
-        return;
-}
-
-template< class InputIterator1, class InputIterator2, class OutputIterator >
-void zip( InputIterator1 b1, InputIterator1 e1, InputIterator2 b2, InputIterator2 e2, OutputIterator out ) {
-        while ( b1 != e1 && b2 != e2 )
-                *out++ = std::pair<typename InputIterator1::value_type, typename InputIterator2::value_type>(*b1++, *b2++);
+template< typename... Args >
+auto filter(Args&&... args) -> decltype(std::copy_if(std::forward<Args>(args)...)) {
+  return std::copy_if(std::forward<Args>(args)...);
+}
+
+template< typename... Args >
+auto zip(Args&&... args) -> decltype(zipWith(std::forward<Args>(args)..., std::make_pair)) {
+  return zipWith(std::forward<Args>(args)..., std::make_pair);
 }
 
@@ -221 +187 @@
 
 // it's nice to actually be able to increment iterators by an arbitrary amount
-template< typename Iterator >
-Iterator operator+(Iterator i, int inc) {
-        while ( inc > 0 ) {
-                ++i;
-                --inc;
-        }
-        return i;
+template< class InputIt, class Distance >
+InputIt operator+( InputIt it, Distance n ) {
+        advance(it, n);
+        return it;
 }
 
@@ -246 +209 @@
         warn_single( params... );
 }
+
+// -----------------------------------------------------------------------------
+// Ref Counted Singleton class
+// Objects that inherit from this class will have at most one reference to it
+// but if all references die, the object will be deleted.
 
 template< typename ThisType >
@@ -265 +233 @@
 std::weak_ptr<ThisType> RefCountSingleton<ThisType>::global_instance;
 
+// -----------------------------------------------------------------------------
 // RAII object to regulate "save and restore" behaviour, e.g.
 // void Foo::bar() {
@@ -279 +248 @@
 };
 
+// -----------------------------------------------------------------------------
+// Helper struct and function to support
+// for ( val : reverseIterate( container ) ) {}
+// syntax to have a for each that iterates backwards
+
 template< typename T >
 struct reverseIterate_t {

src/InitTweak/InitTweak.cc

@@ -304 +304 @@
 
         namespace {
-                VariableExpr * getCalledFunction( ApplicationExpr * appExpr ) {
-                        assert( appExpr );
-                        // xxx - it's possible this can be other things, e.g. MemberExpr, so this is insufficient
-                        return dynamic_cast< VariableExpr * >( appExpr->get_function() );
+                DeclarationWithType * getCalledFunction( Expression * expr ) {
+                        assert( expr );
+                        if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
+                                return varExpr->get_var();
+                        } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( expr ) ) {
+                                return memberExpr->get_member();
+                        } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                                return getCalledFunction( castExpr->get_arg() );
+                        }
+                        return nullptr;
                 }
         }
@@ -314 +320 @@
                 ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
                 if ( ! appExpr ) return NULL;
-                VariableExpr * function = getCalledFunction( appExpr );
+                DeclarationWithType * function = getCalledFunction( appExpr->get_function() );
                 assert( function );
                 // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
                 // will call all member dtors, and some members may have a user defined dtor.
-                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
+                return function->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
         }
 
@@ -379 +385 @@
                         }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( func ) ) {
                                 return funcName( castExpr->get_arg() );
+                        } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( func ) ) {
+                                return memberExpr->get_member()->get_name();
                         } else {
                                 assert( false && "Unexpected expression type being called as a function in call expression" );
@@ -472 +480 @@
         bool isConstructor( const std::string & str ) { return str == "?{}"; }
         bool isDestructor( const std::string & str ) { return str == "^?{}"; }
+        bool isAssignment( const std::string & str ) { return str == "?=?"; }
         bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); }
-
-        FunctionDecl * isCopyConstructor( Declaration * decl ) {
+        bool isCtorDtorAssign( const std::string & str ) { return isCtorDtor( str ) || isAssignment( str ); }
+
+        FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname ) {
                 FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
                 if ( ! function ) return 0;
-                if ( ! isConstructor( function->get_name() ) ) return 0;
+                if ( function->get_name() != fname ) return 0;
                 FunctionType * ftype = function->get_functionType();
                 if ( ftype->get_parameters().size() != 2 ) return 0;
@@ -486 +496 @@
                 assert( ptrType );
 
-                if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
+                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
                         return function;
                 } else {
-                        return 0;
-                }
+                        return nullptr;
+                }
+        }
+
+        FunctionDecl * isCopyConstructor( Declaration * decl ) {
+                return isCopyFunction( decl, "?{}" );
         }
 }

src/InitTweak/InitTweak.h

@@ -28 +28 @@
         bool isConstructor( const std::string & );
         bool isDestructor( const std::string & );
+        bool isAssignment( const std::string & );
         bool isCtorDtor( const std::string & );
+        bool isCtorDtorAssign( const std::string & );
 
         FunctionDecl * isCopyConstructor( Declaration * decl );
+        FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname );
 
         /// transform Initializer into an argument list that can be passed to a call expression

src/SymTab/Indexer.cc

@@ -105 +105 @@
 
         void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
-                // only need to perform this step for constructors and destructors
-                if ( ! InitTweak::isCtorDtor( id ) ) return;
+                // only need to perform this step for constructors, destructors, and assignment functions
+                if ( ! InitTweak::isCtorDtorAssign( id ) ) return;
 
                 // helpful data structure
@@ -127 +127 @@
                                 bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
                                 bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
-                                bool isCopyFunc = InitTweak::isCopyConstructor( function );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
                                 userDefinedFunc = userDefinedFunc || isUserDefinedFunc;