Changeset 0df292b for src/ResolvExpr/Unify.cc

Timestamp:

Jun 26, 2015, 11:48:28 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

2871210

Parents:

721f17a (diff), 937e51d (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 plg2:software/cfa/cfa-cc

File:

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

src/ResolvExpr/Unify.cc

@@ -73 +73 @@
         };
 
+        /// 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 );
@@ -148 +150 @@
                         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();
@@ -280 +283 @@
                 TypeEnvironment debugEnv( env );
 #endif
+                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
+                        return false;
+                }
+
                 bool result;
                 TypeInstType *var1 = dynamic_cast< TypeInstType* >( type1 );
@@ -292 +299 @@
                 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 ) {