Changeset 0df292b

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

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• AlternativeFinder.h (modified) (1 diff)
• FindOpenVars.h (modified) (1 diff)
• RenameVars.cc (modified) (3 diffs)
• RenameVars.h (modified) (1 diff)
• Unify.cc (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -89 +89 @@
                 };
 
+                /// Prunes a list of alternatives down to those that have the minimum conversion cost for a given return type; skips ambiguous interpretations
                 template< typename InputIterator, typename OutputIterator >
                 void pruneAlternatives( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer ) {
@@ -353 +354 @@
 
         bool AlternativeFinder::instantiateFunction( std::list< DeclarationWithType* >& formals, /*const*/ AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave ) {
-                std::list< TypeEnvironment > toBeDone;
                 simpleCombineEnvironments( actuals.begin(), actuals.end(), resultEnv );
                 // make sure we don't widen any existing bindings

src/ResolvExpr/AlternativeFinder.h

@@ -30 +30 @@
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
                 void find( Expression *expr, bool adjust = false );
+                /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
                 void findWithAdjustment( Expression *expr );
                 AltList &get_alternatives() { return alternatives; }

src/ResolvExpr/FindOpenVars.h

@@ -21 +21 @@
 
 namespace ResolvExpr {
+        // Updates open and closed variables and their associated assertions
         void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
 } // namespace ResolvExpr

src/ResolvExpr/RenameVars.cc

@@ -118 +118 @@
 ///     type->print( std::cout );
 ///     std::cout << std::endl;
+                        // copies current name mapping into new mapping
                         mapStack.push_front( mapStack.front() );
+                        // renames all "forall" type names to `_${level}_${name}'
                         for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 std::ostringstream output;
@@ -125 +127 @@
                                 mapStack.front()[ (*i)->get_name() ] = newname;
                                 (*i)->set_name( newname );
+                                // ditto for assertion names, the next level in
                                 level++;
                                 acceptAll( (*i)->get_assertions(), *this );
@@ -132 +135 @@
 
         void RenameVars::typeAfter( Type *type ) {
+                // clears name mapping added by typeBefore()
                 if ( ! type->get_forall().empty() ) {
                         mapStack.pop_front();

src/ResolvExpr/RenameVars.h

@@ -25 +25 @@
 
 namespace ResolvExpr {
+
+        /// Provides a consistent renaming of forall type names in a hierarchy by prefixing them with a unique "level" ID
         class RenameVars : public Visitor {
           public:

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 ) {