Changes in src/ResolvExpr/CommonType.cc [4cb935e:a2a77af]

File:

• src/ResolvExpr/CommonType.cc (modified) (2 diffs)

src/ResolvExpr/CommonType.cc

@@ -42 +42 @@
                 virtual void visit( OneType *oneType );
 
+                void getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
 
@@ -145 +146 @@
         }
 
+        void CommonType::getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer ) {
+                if ( TypeInstType* var = dynamic_cast< TypeInstType* >( otherPointer->get_base() ) ) {
+                        OpenVarSet::const_iterator entry = openVars.find( var->get_name() );
+                        if ( entry != openVars.end() ) {
+                                AssertionSet need, have;
+                                WidenMode widen( widenFirst, widenSecond );
+                                if ( entry != openVars.end() && ! bindVar(var, voidPointer->get_base(), entry->second, env, need, have, openVars, widen, indexer ) ) return;
+                        }
+                }
+                result = voidPointer->clone();
+                result->get_qualifiers() += otherPointer->get_qualifiers();
+        }
+        
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
-                                result = otherPointer->clone();
-                                result->get_qualifiers() += pointerType->get_qualifiers();
+                                getCommonWithVoidPointer( otherPointer, pointerType );
                         } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
-                                result = pointerType->clone();
-                                result->get_qualifiers() += otherPointer->get_qualifiers();
+                                getCommonWithVoidPointer( pointerType, otherPointer );
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
                                            && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {