Changeset eba74ba for src/GenPoly

Timestamp:

May 25, 2018, 2:51:06 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/GenPoly

Files:

• GenPoly.cc (modified) (1 diff)
• Lvalue.cc (modified) (3 diffs)

src/GenPoly/GenPoly.cc

@@ -371 +371 @@
                         return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
                                 || typesPolyCompatible( ap->get_base(), bp->get_base() );
+                } else if ( aid == type_index{typeid(ReferenceType)} ) {
+                        ReferenceType *ap = as<ReferenceType>(a), *bp = as<ReferenceType>(b);
+                        return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
+                                || typesPolyCompatible( ap->get_base(), bp->get_base() );
                 } else if ( aid == type_index{typeid(ArrayType)} ) {
                         ArrayType *aa = as<ArrayType>(a), *ba = as<ArrayType>(b);

src/GenPoly/Lvalue.cc

@@ -165 +165 @@
                         if ( isIntrinsicReference( appExpr ) ) {
                                 // eliminate reference types from intrinsic applications - now they return lvalues
-                                Type * result = appExpr->result;
-                                appExpr->result = result->stripReferences()->clone();
+                                ReferenceType * result = strict_dynamic_cast< ReferenceType * >( appExpr->result );
+                                appExpr->result = result->base->clone();
                                 appExpr->result->set_lvalue( true );
                                 if ( ! inIntrinsic ) {
@@ -181 +181 @@
                 void FixIntrinsicResult::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( inIntrinsic );
-                        inIntrinsic =  funcDecl->linkage == LinkageSpec::Intrinsic;
+                        inIntrinsic = funcDecl->linkage == LinkageSpec::Intrinsic;
                 }
 
@@ -399 +399 @@
                                         ret = new AddressExpr( ret );
                                 }
-                                if ( srcType->get_lvalue() && srcType->get_qualifiers() != strict_dynamic_cast<ReferenceType *>( destType )->base->get_qualifiers() ) {
+                                if ( srcType->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
                                         // must keep cast if cast-to type is different from the actual type
                                         castExpr->arg = ret;