Changes in src/ResolvExpr/Unify.cc [62423350:36a5a77]

File:

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

src/ResolvExpr/Unify.cc

@@ -42 +42 @@
                 virtual void visit(PointerType *pointerType);
                 virtual void visit(ArrayType *arrayType);
+                virtual void visit(ReferenceType *refType);
                 virtual void visit(FunctionType *functionType);
                 virtual void visit(StructInstType *aggregateUseType);
@@ -142 +143 @@
 
         bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+                // remove references from other, so that type variables can only bind to value types
+                other = other->stripReferences();
                 OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
                 assert( tyvar != openVars.end() );
@@ -376 +379 @@
                                 } // if
                         } else {
+                                common = type1->clone();
+                                common->get_qualifiers() = tq1 | tq2;
                                 result = true;
                         } // if
@@ -425 +430 @@
                         markAssertions( haveAssertions, needAssertions, pointerType );
                         markAssertions( haveAssertions, needAssertions, otherPointer );
+                } // if
+        }
+
+        void Unify::visit(ReferenceType *refType) {
+                if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
+                        result = unifyExact( refType->get_base(), otherRef->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
+                        markAssertions( haveAssertions, needAssertions, refType );
+                        markAssertions( haveAssertions, needAssertions, otherRef );
                 } // if
         }