Changes in src/GenPoly/Lvalue.cc [57acae0:6b8c4a8]

File:

• src/GenPoly/Lvalue.cc (modified) (3 diffs)

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;