Changeset b6838214 for src/ResolvExpr/CommonType.cc

Timestamp:

Jan 23, 2018, 5:46:43 PM (8 years ago)

Author:

Alan Kennedy <afakenne@…>

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:

258e6ad5

Parents:

b158d8f (diff), 15d248e (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:

add context switch for ARM

File:

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

src/ResolvExpr/CommonType.cc

@@ -18 +18 @@
 #include <utility>                       // for pair
 
+#include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for OpenVarSet, AssertionSet
 #include "SymTab/Indexer.h"              // for Indexer
@@ -29 +30 @@
 
 namespace ResolvExpr {
-        class CommonType : public Visitor {
-          public:
+        struct CommonType : public WithShortCircuiting {
                 CommonType( Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
                 Type *get_result() const { return result; }
+
+                void previsit( BaseSyntaxNode * ) { visit_children = false; }
+
+                void postvisit( VoidType * voidType );
+                void postvisit( BasicType * basicType );
+                void postvisit( PointerType * pointerType );
+                void postvisit( ArrayType * arrayType );
+                void postvisit( ReferenceType * refType );
+                void postvisit( FunctionType * functionType );
+                void postvisit( StructInstType * aggregateUseType );
+                void postvisit( UnionInstType * aggregateUseType );
+                void postvisit( EnumInstType * aggregateUseType );
+                void postvisit( TraitInstType * aggregateUseType );
+                void postvisit( TypeInstType * aggregateUseType );
+                void postvisit( TupleType * tupleType );
+                void postvisit( VarArgsType * varArgsType );
+                void postvisit( ZeroType * zeroType );
+                void postvisit( OneType * oneType );
+
           private:
-                virtual void visit( VoidType *voidType );
-                virtual void visit( BasicType *basicType );
-                virtual void visit( PointerType *pointerType );
-                virtual void visit( ArrayType *arrayType );
-                virtual void visit( ReferenceType *refType );
-                virtual void visit( FunctionType *functionType );
-                virtual void visit( StructInstType *aggregateUseType );
-                virtual void visit( UnionInstType *aggregateUseType );
-                virtual void visit( EnumInstType *aggregateUseType );
-                virtual void visit( TraitInstType *aggregateUseType );
-                virtual void visit( TypeInstType *aggregateUseType );
-                virtual void visit( TupleType *tupleType );
-                virtual void visit( VarArgsType *varArgsType );
-                virtual void visit( ZeroType *zeroType );
-                virtual void visit( OneType *oneType );
-
                 template< typename Pointer > void getCommonWithVoidPointer( Pointer* voidPointer, Pointer* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
@@ -80 +83 @@
 
         Type *commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars ) {
-                CommonType visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
+                PassVisitor<CommonType> visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
 
                 int depth1 = type1->referenceDepth();
@@ -91 +94 @@
                         // special case where one type has a reference depth of 1 larger than the other
                         if ( diff > 0 || diff < 0 ) {
+                                // std::cerr << "reference depth diff: " << diff << std::endl;
                                 Type * result = nullptr;
-                                if ( ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 ) ) {
+                                ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 );
+                                ReferenceType * ref2 = dynamic_cast< ReferenceType * >( type2 );
+                                if ( diff > 0 ) {
+                                        // deeper on the left
+                                        assert( ref1 );
+                                        result = handleReference( ref1->base, type2, widenFirst, widenSecond, indexer, env, openVars );
+                                } else {
+                                        // deeper on the right
+                                        assert( ref2 );
+                                        result = handleReference( type1, ref2->base, widenFirst, widenSecond, indexer, env, openVars );
+                                }
+                                if ( result && ref1 ) {
                                         // formal is reference, so result should be reference
-                                        result = handleReference( ref1->base, type2, widenFirst, widenSecond, indexer, env, openVars );
-                                        if ( result ) result = new ReferenceType( ref1->get_qualifiers(), result );
-                                } else {
-                                        // formal is value, so result should be value
-                                        ReferenceType * ref2 = strict_dynamic_cast< ReferenceType * > ( type2 );
-                                        result = handleReference( type1, ref2->base, widenFirst, widenSecond, indexer, env, openVars );
+                                        // std::cerr << "formal is reference; result should be reference" << std::endl;
+                                        result = new ReferenceType( ref1->get_qualifiers(), result );
                                 }
                                 // std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
@@ -108 +119 @@
 
                 type1->accept( visitor );
-                Type *result = visitor.get_result();
+                Type *result = visitor.pass.get_result();
                 if ( ! result ) {
                         // this appears to be handling for opaque type declarations
@@ -180 +191 @@
         }
 
-        void CommonType::visit( __attribute((unused)) VoidType *voidType ) {}
-
-        void CommonType::visit( BasicType *basicType ) {
+        void CommonType::postvisit( VoidType * ) {}
+
+        void CommonType::postvisit( BasicType *basicType ) {
                 if ( BasicType *otherBasic = dynamic_cast< BasicType* >( type2 ) ) {
                         BasicType::Kind newType = combinedType[ basicType->get_kind() ][ otherBasic->get_kind() ];
@@ -211 +222 @@
         }
 
-        void CommonType::visit( PointerType *pointerType ) {
+        void CommonType::postvisit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         // std::cerr << "commonType: two pointers: " << pointerType << " / " << otherPointer << std::endl;
@@ -246 +257 @@
         }
 
-        void CommonType::visit( __attribute((unused)) ArrayType *arrayType ) {}
-
-        void CommonType::visit( ReferenceType *refType ) {
+        void CommonType::postvisit( ArrayType * ) {}
+
+        void CommonType::postvisit( ReferenceType *refType ) {
                 if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
                         // std::cerr << "commonType: both references: " << refType << " / " << otherRef << std::endl;
@@ -283 +294 @@
         }
 
-        void CommonType::visit( __attribute((unused)) FunctionType *functionType ) {}
-        void CommonType::visit( __attribute((unused)) StructInstType *aggregateUseType ) {}
-        void CommonType::visit( __attribute((unused)) UnionInstType *aggregateUseType ) {}
-
-        void CommonType::visit( EnumInstType *enumInstType ) {
+        void CommonType::postvisit( FunctionType * ) {}
+        void CommonType::postvisit( StructInstType * ) {}
+        void CommonType::postvisit( UnionInstType * ) {}
+
+        void CommonType::postvisit( EnumInstType *enumInstType ) {
                 if ( dynamic_cast< BasicType * >( type2 ) || dynamic_cast< ZeroType* >( type2 ) || dynamic_cast< OneType* >( type2 ) ) {
                         // reuse BasicType, EnumInstType code by swapping type2 with enumInstType
-                        ValueGuard< Type * > temp( type2 );
-                        type2 = enumInstType;
-                        temp.old->accept( *this );
-                } // if
-        }
-
-        void CommonType::visit( __attribute((unused)) TraitInstType *aggregateUseType ) {
-        }
-
-        void CommonType::visit( TypeInstType *inst ) {
+                        result = commonType( type2, enumInstType, widenSecond, widenFirst, indexer, env, openVars );
+                } // if
+        }
+
+        void CommonType::postvisit( TraitInstType * ) {
+        }
+
+        void CommonType::postvisit( TypeInstType *inst ) {
                 if ( widenFirst ) {
                         NamedTypeDecl *nt = indexer.lookupType( inst->get_name() );
@@ -321 +330 @@
         }
 
-        void CommonType::visit( __attribute((unused)) TupleType *tupleType ) {}
-        void CommonType::visit( __attribute((unused)) VarArgsType *varArgsType ) {}
-
-        void CommonType::visit( ZeroType *zeroType ) {
+        void CommonType::postvisit( TupleType * ) {}
+        void CommonType::postvisit( VarArgsType * ) {}
+
+        void CommonType::postvisit( ZeroType *zeroType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< PointerType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {
@@ -338 +347 @@
         }
 
-        void CommonType::visit( OneType *oneType ) {
+        void CommonType::postvisit( OneType *oneType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {