Changeset 5b51f5e for src/ResolvExpr/CommonType.cc

Timestamp:

Jan 5, 2018, 3:21:42 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

65deb18, cae28da

Parents:

5c4f2c2 (diff), b834e98 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/CommonType.cc

@@ -91 +91 @@
                         // 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;
@@ -180 +188 @@
         }
 
-        void CommonType::visit( __attribute((unused)) VoidType *voidType ) {}
+        void CommonType::visit( VoidType * ) {}
 
         void CommonType::visit( BasicType *basicType ) {
@@ -246 +254 @@
         }
 
-        void CommonType::visit( __attribute((unused)) ArrayType *arrayType ) {}
+        void CommonType::visit( ArrayType * ) {}
 
         void CommonType::visit( ReferenceType *refType ) {
@@ -283 +291 @@
         }
 
-        void CommonType::visit( __attribute((unused)) FunctionType *functionType ) {}
-        void CommonType::visit( __attribute((unused)) StructInstType *aggregateUseType ) {}
-        void CommonType::visit( __attribute((unused)) UnionInstType *aggregateUseType ) {}
+        void CommonType::visit( FunctionType * ) {}
+        void CommonType::visit( StructInstType * ) {}
+        void CommonType::visit( UnionInstType * ) {}
 
         void CommonType::visit( EnumInstType *enumInstType ) {
@@ -296 +304 @@
         }
 
-        void CommonType::visit( __attribute((unused)) TraitInstType *aggregateUseType ) {
+        void CommonType::visit( TraitInstType * ) {
         }
 
@@ -321 +329 @@
         }
 
-        void CommonType::visit( __attribute((unused)) TupleType *tupleType ) {}
-        void CommonType::visit( __attribute((unused)) VarArgsType *varArgsType ) {}
+        void CommonType::visit( TupleType * ) {}
+        void CommonType::visit( VarArgsType * ) {}
 
         void CommonType::visit( ZeroType *zeroType ) {