Changeset 78a0b88 for src/ResolvExpr/TypeEnvironment.cc
- Timestamp:
- Sep 1, 2017, 3:33:25 PM (7 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:
- bc3127d
- Parents:
- e8ccca3 (diff), a01f7c94 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ResolvExpr/TypeEnvironment.cc
re8ccca3 r78a0b88 25 25 26 26 namespace ResolvExpr { 27 // adding this comparison operator significantly improves assertion resolution run time for28 // some cases. The current resolution algorithm's speed partially depends on the order of29 // assertions. Assertions which have fewer possible matches should appear before30 // assertions which have more possible matches. This seems to imply that this could31 // be further improved by providing an indexer as an additional argument and ordering based32 // on the number of matches of the same kind (object, function) for the names of the33 // declarations.34 //35 // I've seen a TU go from 54 minutes to 1 minute 34 seconds with the addition of this comparator.36 bool AssertCompare::operator()( DeclarationWithType * d1, DeclarationWithType * d2 ) const {37 // Objects are always less than functions38 if ( ObjectDecl * objectDecl1 = dynamic_cast< ObjectDecl * >( d1 ) ) {39 if ( ObjectDecl * objectDecl2 = dynamic_cast< ObjectDecl * >( d2 ) ) {40 // objects are ordered by name then type pointer, in that order41 int cmp = objectDecl1->get_name().compare( objectDecl2->get_name() );42 return cmp < 0 ||43 ( cmp == 0 && objectDecl1->get_type() < objectDecl2->get_type() );44 } else {45 return true;46 }47 } else if ( FunctionDecl * funcDecl1 = dynamic_cast< FunctionDecl * >( d1 ) ) {48 if ( FunctionDecl * funcDecl2 = dynamic_cast< FunctionDecl * >( d2 ) ) {49 // functions are ordered by name, # parameters, # returnVals, type pointer in that order50 FunctionType * ftype1 = funcDecl1->get_functionType();51 FunctionType * ftype2 = funcDecl2->get_functionType();52 int numThings1 = ftype1->get_parameters().size() + ftype1->get_returnVals().size();53 int numThings2 = ftype2->get_parameters().size() + ftype2->get_returnVals().size();54 if ( numThings1 < numThings2 ) return true;55 if ( numThings1 > numThings2 ) return false;56 57 // if ( ftype1->get_parameters().size() < ftype2->get_parameters().size() ) return true;58 // else if ( ftype1->get_parameters().size() > ftype2->get_parameters().size() ) return false;59 // // same number of parameters60 // if ( ftype1->get_returnVals().size() < ftype2->get_returnVals().size() ) return true;61 // else if ( ftype1->get_returnVals().size() > ftype2->get_returnVals().size() ) return false;62 // same number of return vals63 // int cmp = funcDecl1->get_name().compare( funcDecl2->get_name() );64 // if ( cmp < 0 ) return true;65 // else if ( cmp > 0 ) return false;66 // // same name67 return ftype1 < ftype2;68 } else {69 return false;70 }71 } else {72 assert( false );73 }74 }75 76 27 void printAssertionSet( const AssertionSet &assertions, std::ostream &os, int indent ) { 77 28 for ( AssertionSet::const_iterator i = assertions.begin(); i != assertions.end(); ++i ) {
Note: See TracChangeset
for help on using the changeset viewer.