Changeset 0a73148 for src/ResolvExpr

Timestamp:

Jul 13, 2018, 6:36:34 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

6da49249

Parents:

6b8b767 (diff), ae144af (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:

fix conflict

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• CommonType.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -482 +482 @@
         template< typename ForwardIterator, typename OutputIterator >
         void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+                if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
@@ -1185 +1186 @@
                                 std::cerr << "bindings are:" << std::endl;
                                 withFunc.env.print( std::cerr, 8 );
+                                std::cerr << "cost is: " << withFunc.cost << std::endl;
                                 std::cerr << "cost of conversion is:" << cvtCost << std::endl;
                         )

src/ResolvExpr/CommonType.cc

@@ -267 +267 @@
                                                 result = otherPointer->clone();
                                         } // if
-                                        result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<PointerType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
@@ -304 +304 @@
                                                 result = otherRef->clone();
                                         } // if
-                                        result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<ReferenceType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;