Changeset 2c57025 for src/ResolvExpr/CommonType.cc

Timestamp:

Nov 25, 2016, 6:11:03 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:

0f35657

Parents:

186fd86

Message:

add support for built-in sized trait which decouples size/alignment information from otype parameters, add test for sized trait

File:

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

src/ResolvExpr/CommonType.cc

@@ -57 +57 @@
                 Type *result = visitor.get_result();
                 if ( ! result ) {
+                        // this appears to be handling for opaque type declarations
                         if ( widenSecond ) {
-                                TypeInstType *inst = dynamic_cast< TypeInstType* >( type2 );
-                                if ( inst ) {
-                                        NamedTypeDecl *nt = indexer.lookupType( inst->get_name() );
-                                        if ( nt ) {
-                                                TypeDecl *type = dynamic_cast< TypeDecl* >( nt );
-                                                assert( type );
+                                if ( TypeInstType *inst = dynamic_cast< TypeInstType* >( type2 ) ) {
+                                        if ( NamedTypeDecl *nt = indexer.lookupType( inst->get_name() ) ) {
+                                                TypeDecl *type = safe_dynamic_cast< TypeDecl* >( nt );
                                                 if ( type->get_base() ) {
                                                         Type::Qualifiers tq1 = type1->get_qualifiers(), tq2 = type2->get_qualifiers();
@@ -145 +143 @@
         }
 
+        /// 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();
+                }
+                return false;
+        }
+
         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) ) {
+                        // 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();
@@ -211 +225 @@
                         NamedTypeDecl *nt = indexer.lookupType( inst->get_name() );
                         if ( nt ) {
-                                TypeDecl *type = dynamic_cast< TypeDecl* >( nt );
-                                assert( type );
+                                TypeDecl *type = safe_dynamic_cast< TypeDecl* >( nt );
                                 if ( type->get_base() ) {
                                         Type::Qualifiers tq1 = inst->get_qualifiers(), tq2 = type2->get_qualifiers();