Changeset 21bdce2 for src/GenPoly

Timestamp:

May 21, 2018, 10:52:15 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

2f0a0678

Parents:

b12c036 (diff), 1596726 (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 plg2:software/cfa/cfa-cc

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

@@ -166 +166 @@
                         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 ) {
@@ -183 +183 @@
                 void FixIntrinsicResult::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( inIntrinsic );
-                        inIntrinsic =  funcDecl->linkage == LinkageSpec::Intrinsic;
+                        inIntrinsic = funcDecl->linkage == LinkageSpec::Intrinsic;
                 }
 
@@ -403 +403 @@
                                         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;