Changeset a2a77af


Ignore:
Timestamp:
Dec 8, 2016, 5:05:42 PM (5 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
76e9498
Parents:
550a338
Message:

Fix void* to dtype* bindings

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/CommonType.cc

    r550a338 ra2a77af  
    4242                virtual void visit( OneType *oneType );
    4343
     44                void getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer );
    4445                template< typename RefType > void handleRefType( RefType *inst, Type *other );
    4546
     
    145146        }
    146147
     148        void CommonType::getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer ) {
     149                if ( TypeInstType* var = dynamic_cast< TypeInstType* >( otherPointer->get_base() ) ) {
     150                        OpenVarSet::const_iterator entry = openVars.find( var->get_name() );
     151                        if ( entry != openVars.end() ) {
     152                                AssertionSet need, have;
     153                                WidenMode widen( widenFirst, widenSecond );
     154                                if ( entry != openVars.end() && ! bindVar(var, voidPointer->get_base(), entry->second, env, need, have, openVars, widen, indexer ) ) return;
     155                        }
     156                }
     157                result = voidPointer->clone();
     158                result->get_qualifiers() += otherPointer->get_qualifiers();
     159        }
     160       
    147161        void CommonType::visit( PointerType *pointerType ) {
    148162                if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
    149163                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
    150                                 result = otherPointer->clone();
    151                                 result->get_qualifiers() += pointerType->get_qualifiers();
     164                                getCommonWithVoidPointer( otherPointer, pointerType );
    152165                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
    153                                 result = pointerType->clone();
    154                                 result->get_qualifiers() += otherPointer->get_qualifiers();
     166                                getCommonWithVoidPointer( pointerType, otherPointer );
    155167                        } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
    156168                                           && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {
  • src/ResolvExpr/Unify.cc

    r550a338 ra2a77af  
    3131
    3232namespace ResolvExpr {
    33         struct WidenMode {
    34                 WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
    35                 WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
    36                 WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
    37                 WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
    38                 WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
    39                 operator bool() { return widenFirst && widenSecond; }
    40 
    41                 bool widenFirst : 1, widenSecond : 1;
    42         };
    4333
    4434        class Unify : public Visitor {
  • src/ResolvExpr/Unify.h

    r550a338 ra2a77af  
    2727
    2828namespace ResolvExpr {
     29        struct WidenMode {
     30                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
     31                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
     32                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
     33                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
     34                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
     35                operator bool() { return widenFirst && widenSecond; }
     36
     37                bool widenFirst : 1, widenSecond : 1;
     38        };
     39       
     40        bool bindVar( TypeInstType *typeInst, Type *other, TypeDecl::Kind kind, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
    2941        bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
    3042        bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );
  • src/libcfa/prelude.cf

    r550a338 ra2a77af  
    273273forall( ftype FT ) signed int ?!=?( FT *, FT * );
    274274
    275 forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
    276 forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
    277 forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
    278 forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
     275// forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
     276// forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
     277// forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
     278// forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
    279279
    280280// forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
Note: See TracChangeset for help on using the changeset viewer.