Changeset 0f9e4403 for src/ResolvExpr/Unify.cc

Timestamp:

Apr 15, 2016, 12:03:11 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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 gc_noraii

File:

• src/ResolvExpr/Unify.cc (modified) (13 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 : Rob Schluntz
-// Last Modified On : Wed Sep 02 14:43:22 2015
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:37:05 2016
+// Update Count     : 37
 //
 
@@ -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 );
@@ -78 +79 @@
         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;
@@ -136 +137 @@
                   case TypeDecl::Dtype:
                         return ! isFtype( type, indexer );
-  
+
                   case TypeDecl::Ftype:
                         return isFtype( type, indexer );
@@ -195 +196 @@
                 bool widen1 = false, widen2 = false;
                 Type *type1 = 0, *type2 = 0;
-  
+
                 if ( env.lookup( var1->get_name(), class1 ) ) {
                         hasClass1 = true;
@@ -216 +217 @@
                         widen2 = widenMode.widenSecond && class2.allowWidening;
                 } // if
-  
+
                 if ( type1 && type2 ) {
 //    std::cout << "has type1 && type2" << std::endl;
@@ -435 +436 @@
                 // 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() 
-                                && ((arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0)
-                                        || (arrayType->get_dimension() == 0 && otherArray->get_dimension() == 0))) {
+                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
 
                         // not positive this is correct in all cases, but it's needed for typedefs
@@ -448 +447 @@
                                 ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() );
                                 ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( otherArray->get_dimension() );
-                                assert(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;
+                                // 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;
+                                        }
                                 }
                         }
@@ -484 +486 @@
 
                         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 ) ) {
 
@@ -539 +541 @@
         }
 
-        void Unify::visit(ContextInstType *contextInst) {
+        void Unify::visit(TraitInstType *contextInst) {
                 handleRefType( contextInst, type2 );
         }
@@ -582 +584 @@
         }
 
+        void Unify::visit(VarArgsType *varArgsType) {
+                result = dynamic_cast< VarArgsType* >( type2 );
+        }
+
 } // namespace ResolvExpr