Changeset 66f8528 for src/ResolvExpr

Timestamp:

Dec 15, 2016, 5:16:42 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

Location:

src/ResolvExpr

Files:

• CommonType.cc (modified) (4 diffs)
• Resolver.cc (modified) (3 diffs)
• Unify.cc (modified) (1 diff)
• Unify.h (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 );
 
@@ -143 +144 @@
         }
 
-        /// true if a common type for t must be a complete type
-        bool requiredComplete( Type * t ) {
-                if ( TypeInstType * inst = dynamic_cast< TypeInstType * > ( t ) ) {
-                        return inst->get_baseType()->isComplete();
+        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;
+                        }
                 }
-                return false;
+                result = voidPointer->clone();
+                result->get_qualifiers() += otherPointer->get_qualifiers();
         }
 
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
-                        // Note: relationship between formal and actual types is antisymmetric
-                        //   void free(void *);
-                        //   forall(otype T) void foo(T *);
-                        //
-                        // should be able to pass T* to free, but should not be able to pass a void* to foo.
-                        // because of this, the requiredComplete check occurs only on the first, since it corresponds
-                        // to the formal parameter type (though this may be incorrect in some cases, in which case
-                        // perhaps the widen mode needs to incorporate another bit for whether this is a formal or actual context)
-                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) && ! requiredComplete( pointerType->get_base() ) ) {
-                                result = otherPointer->clone();
-                                result->get_qualifiers() += pointerType->get_qualifiers();
+                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
+                                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 ) ) {
@@ -256 +252 @@
                                         result->get_qualifiers() += zeroType->get_qualifiers();
                                 }
+                        } else if ( widenSecond && dynamic_cast< OneType* >( type2 ) ) {
+                                result = new BasicType( zeroType->get_qualifiers(), BasicType::SignedInt );
+                                result->get_qualifiers() += type2->get_qualifiers();
                         }
                 }
@@ -267 +266 @@
                                         result->get_qualifiers() += oneType->get_qualifiers();
                                 }
+                        } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
+                                result = new BasicType( oneType->get_qualifiers(), BasicType::SignedInt );
+                                result->get_qualifiers() += type2->get_qualifiers();
                         }
                 }

src/ResolvExpr/Resolver.cc ¶

@@ -404 +404 @@
         template< typename AggrInst >
         TypeSubstitution makeGenericSubstitutuion( AggrInst * inst ) {
+                assert( inst );
+                assert( inst->get_baseParameters() );
                 std::list< TypeDecl * > baseParams = *inst->get_baseParameters();
                 std::list< Expression * > typeSubs = inst->get_parameters();
@@ -444 +446 @@
 
         void Resolver::resolveAggrInit( ReferenceToType * inst, InitIterator & init, InitIterator & initEnd ) {
-
                 if ( StructInstType * sit = dynamic_cast< StructInstType * >( inst ) ) {
                         TypeSubstitution sub = makeGenericSubstitutuion( sit );
@@ -455 +456 @@
                         }
                 } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( inst ) ) {
-                        TypeSubstitution sub = makeGenericSubstitutuion( sit );
+                        TypeSubstitution sub = makeGenericSubstitutuion( uit );
                         UnionDecl * un = uit->get_baseUnion();
                         // only resolve to the first member of a union

src/ResolvExpr/Unify.cc ¶

@@ -31 +31 @@
 
 namespace ResolvExpr {
-        struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
-
-                bool widenFirst : 1, widenSecond : 1;
-        };
 
         class Unify : public Visitor {

src/ResolvExpr/Unify.h ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Unify.h -- 
+// Unify.h --
 //
 // Author           : Richard C. Bilson
@@ -27 +27 @@
 
 namespace ResolvExpr {
+        struct WidenMode {
+                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
+                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
+                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
+                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
+                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
+                operator bool() { return widenFirst && widenSecond; }
+
+                bool widenFirst : 1, widenSecond : 1;
+        };
+
+        bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );