Changes in src/ResolvExpr/Unify.cc [721f17a:4040425]

File:

• src/ResolvExpr/Unify.cc (modified) (18 diffs)

src/ResolvExpr/Unify.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Unify.cc -- 
+// Unify.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 14:57:05 2015
-// Update Count     : 7
+// Last Modified On : Wed Mar  2 17:37:05 2016
+// Update Count     : 37
 //
 
@@ -25 +25 @@
 #include "SynTree/Declaration.h"
 #include "SymTab/Indexer.h"
-#include "utility.h"
-
-
-//#define DEBUG
+#include "Common/utility.h"
+
+
+// #define DEBUG
 
 namespace ResolvExpr {
@@ -38 +38 @@
                 WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
                 operator bool() { return widenFirst && widenSecond; }
-  
+
                 bool widenFirst : 1, widenSecond : 1;
         };
@@ -45 +45 @@
           public:
                 Unify( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
-  
+
                 bool get_result() const { return result; }
           private:
@@ -56 +56 @@
                 virtual void visit(UnionInstType *aggregateUseType);
                 virtual void visit(EnumInstType *aggregateUseType);
-                virtual void visit(ContextInstType *aggregateUseType);
+                virtual void visit(TraitInstType *aggregateUseType);
                 virtual void visit(TypeInstType *aggregateUseType);
                 virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
 
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
+                template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
 
                 bool result;
@@ -73 +75 @@
         };
 
+        /// Attempts an inexact unification of type1 and type2.
+        /// Returns false if no such unification; if the types can be unified, sets common (unless they unify exactly and have identical type qualifiers)
         bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common );
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
-  
+
         bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 TypeEnvironment newEnv;
-                OpenVarSet openVars;
+                OpenVarSet openVars, closedVars; // added closedVars
                 AssertionSet needAssertions, haveAssertions;
                 Type *newFirst = first->clone(), *newSecond = second->clone();
                 env.apply( newFirst );
                 env.apply( newSecond );
+
+                // do we need to do this? Seems like we do, types should be able to be compatible if they
+                // have free variables that can unify
+                findOpenVars( newFirst, openVars, closedVars, needAssertions, haveAssertions, false );
+                findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true );
+
                 bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 delete newFirst;
@@ -127 +137 @@
                   case TypeDecl::Dtype:
                         return ! isFtype( type, indexer );
-  
+
                   case TypeDecl::Ftype:
                         return isFtype( type, indexer );
@@ -148 +158 @@
                         if ( curClass.type ) {
                                 Type *common = 0;
+                                // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
                                 std::auto_ptr< Type > newType( curClass.type->clone() );
                                 newType->get_qualifiers() = typeInst->get_qualifiers();
@@ -185 +196 @@
                 bool widen1 = false, widen2 = false;
                 Type *type1 = 0, *type2 = 0;
-  
+
                 if ( env.lookup( var1->get_name(), class1 ) ) {
                         hasClass1 = true;
@@ -206 +217 @@
                         widen2 = widenMode.widenSecond && class2.allowWidening;
                 } // if
-  
+
                 if ( type1 && type2 ) {
 //    std::cout << "has type1 && type2" << std::endl;
@@ -280 +291 @@
                 TypeEnvironment debugEnv( env );
 #endif
+                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
+                        return false;
+                }
+
                 bool result;
                 TypeInstType *var1 = dynamic_cast< TypeInstType* >( type1 );
@@ -292 +307 @@
                 bool isopen1 = var1 && ( entry1 != openVars.end() );
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
-                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
-                        return false;
-                } else if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
+
+                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
                         result = bindVarToVar( var1, var2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen1 ) {
@@ -419 +433 @@
 
         void Unify::visit(ArrayType *arrayType) {
-                // XXX -- compare array dimension
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
+                // to unify, array types must both be VLA or both not VLA
+                // and must both have a dimension expression or not have a dimension
                 if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
+
+                        // not positive this is correct in all cases, but it's needed for typedefs
+                        if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) {
+                                return;
+                        }
+
+                        if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() &&
+                                arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) {
+                                ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() );
+                                ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( otherArray->get_dimension() );
+                                // see C11 Reference Manual 6.7.6.2.6
+                                // two array types with size specifiers that are integer constant expressions are
+                                // compatible if both size specifiers have the same constant value
+                                if ( ce1 && ce2 ) {
+                                        Constant * c1 = ce1->get_constant();
+                                        Constant * c2 = ce2->get_constant();
+
+                                        if ( c1->get_value() != c2->get_value() ) {
+                                                // does not unify if the dimension is different
+                                                return;
+                                        }
+                                }
+                        }
+
                         result = unifyExact( arrayType->get_base(), otherArray->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 } // if
@@ -429 +468 @@
         bool unifyDeclList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
                 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
+                        // Type * commonType;
+                        // if ( ! unifyInexact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) {
                         if ( ! unifyExact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ) ) {
                                 return false;
@@ -443 +484 @@
                 FunctionType *otherFunction = dynamic_cast< FunctionType* >( type2 );
                 if ( otherFunction && functionType->get_isVarArgs() == otherFunction->get_isVarArgs() ) {
-  
+
                         if ( unifyDeclList( functionType->get_parameters().begin(), functionType->get_parameters().end(), otherFunction->get_parameters().begin(), otherFunction->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
-        
+
                                 if ( unifyDeclList( functionType->get_returnVals().begin(), functionType->get_returnVals().end(), otherFunction->get_returnVals().begin(), otherFunction->get_returnVals().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
 
@@ -458 +499 @@
 
         template< typename RefType >
-        void Unify::handleRefType( RefType *inst, Type *other ) {  
+        void Unify::handleRefType( RefType *inst, Type *other ) {
+                // check that other type is compatible and named the same
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
                 result = otherStruct && inst->get_name() == otherStruct->get_name();
-        }  
+        }
+
+        template< typename RefType >
+        void Unify::handleGenericRefType( RefType *inst, Type *other ) {
+                // Check that other type is compatible and named the same
+                handleRefType( inst, other );
+                if ( ! result ) return;
+                // Check that parameters of types unify, if any
+                std::list< Expression* > params = inst->get_parameters();
+                std::list< Expression* > otherParams = ((RefType*)other)->get_parameters();
+
+                std::list< Expression* >::const_iterator it = params.begin(), jt = otherParams.begin();
+                for ( ; it != params.end() && jt != otherParams.end(); ++it, ++jt ) {
+                        TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
+                        assert(param && "Aggregate parameters should be type expressions");
+                        TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
+                        assert(otherParam && "Aggregate parameters should be type expressions");
+
+                        if ( ! unifyExact( param->get_type(), otherParam->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
+                                result = false;
+                                return;
+                        }
+                }
+                result = ( it == params.end() && jt == otherParams.end() );
+        }
 
         void Unify::visit(StructInstType *structInst) {
-                handleRefType( structInst, type2 );
+                handleGenericRefType( structInst, type2 );
         }
 
         void Unify::visit(UnionInstType *unionInst) {
-                handleRefType( unionInst, type2 );
+                handleGenericRefType( unionInst, type2 );
         }
 
@@ -475 +541 @@
         }
 
-        void Unify::visit(ContextInstType *contextInst) {
+        void Unify::visit(TraitInstType *contextInst) {
                 handleRefType( contextInst, type2 );
         }
@@ -518 +584 @@
         }
 
+        void Unify::visit(VarArgsType *varArgsType) {
+                result = dynamic_cast< VarArgsType* >( type2 );
+        }
+
 } // namespace ResolvExpr