Changeset a3a17ba for src/ResolvExpr

Timestamp:

Aug 11, 2015, 4:37:37 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

543159b, d58ebf3

Parents:

c29d9ce (diff), 51b1202 (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 /u/cforall/software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• CommonType.cc (modified) (1 diff)
• typeops.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -343 +343 @@
         }
 
+        /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {

src/ResolvExpr/CommonType.cc

@@ -138 +138 @@
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
-                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) ) {
+                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
                                 result = otherPointer->clone();
                                 result->get_qualifiers() += pointerType->get_qualifiers();
-                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) ) {
+                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
                                 result = pointerType->clone();
                                 result->get_qualifiers() += otherPointer->get_qualifiers();

src/ResolvExpr/typeops.h

@@ -117 +117 @@
 
         // in Unify.cc
+        bool isFtype( Type *type, const SymTab::Indexer &indexer );
         bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
         bool typesCompatibleIgnoreQualifiers( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );