Changeset 03da511 for src/ResolvExpr/Unify.cc

Timestamp:

Aug 16, 2016, 3:07:21 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

04cdd9b

Parents:

04273e9

git-author:

Rob Schluntz <rschlunt@…> (08/15/16 17:19:40)

git-committer:

Rob Schluntz <rschlunt@…> (08/16/16 15:07:21)

Message:

added comparator to more intelligently order assertions for resolution and added length checks to short circuit function type unification

File:

• src/ResolvExpr/Unify.cc (modified) (1 diff)

src/ResolvExpr/Unify.cc

@@ -484 +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 ) ) {
-
-                                        markAssertions( haveAssertions, needAssertions, functionType );
-                                        markAssertions( haveAssertions, needAssertions, otherFunction );
-
-                                        result = true;
+                        if ( functionType->get_parameters().size() == otherFunction->get_parameters().size() && functionType->get_returnVals().size() == otherFunction->get_returnVals().size() ) {
+                                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 ) ) {
+
+                                                markAssertions( haveAssertions, needAssertions, functionType );
+                                                markAssertions( haveAssertions, needAssertions, otherFunction );
+
+                                                result = true;
+                                        } // if
                                 } // if
                         } // if