Changeset 3d5701e for src/GenPoly/Lvalue.cc

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

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

src/GenPoly/Lvalue.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:11:18 2017
-// Update Count     : 5
+// Last Modified On : Fri Dec 13 23:14:38 2019
+// Update Count     : 7
 //
 
@@ -17 +17 @@
 #include <string>                        // for string
 
+#include "Common/UniqueName.h"
 #include "Common/PassVisitor.h"
 #include "GenPoly.h"                     // for isPolyType
@@ -22 +23 @@
 
 #include "InitTweak/InitTweak.h"
-#include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
 #include "SymTab/Indexer.h"              // for Indexer
+#include "SynTree/LinkageSpec.h"         // for Spec, isBuiltin, Intrinsic
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
 #include "SynTree/Expression.h"          // for Expression, ConditionalExpr
@@ -54 +55 @@
                                 delete ret->result;
                                 ret->result = base->clone();
-                                ret->result->set_lvalue( true );
                                 return ret;
                         } else {
@@ -61 +61 @@
                 }
 
-                struct ReferenceConversions final : public WithStmtsToAdd {
+                struct ReferenceConversions final : public WithStmtsToAdd, public WithGuards {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
@@ -72 +72 @@
 
                 struct FixIntrinsicResult final : public WithGuards {
+                        enum {
+                                NoSkip,
+                                Skip,
+                                SkipInProgress
+                        } skip = NoSkip;
+
+                        void premutate( AsmExpr * ) { GuardValue( skip ); skip = Skip; }
+                        void premutate( ApplicationExpr * ) { GuardValue( skip ); skip = (skip == Skip) ? SkipInProgress : NoSkip; }
+
+
                         Expression * postmutate( ApplicationExpr * appExpr );
                         void premutate( FunctionDecl * funcDecl );
@@ -163 +173 @@
 
                 Expression * FixIntrinsicResult::postmutate( ApplicationExpr * appExpr ) {
-                        if ( isIntrinsicReference( appExpr ) ) {
+                        if ( skip != SkipInProgress && isIntrinsicReference( appExpr ) ) {
                                 // eliminate reference types from intrinsic applications - now they return lvalues
                                 ReferenceType * result = strict_dynamic_cast< ReferenceType * >( appExpr->result );
                                 appExpr->result = result->base->clone();
-                                appExpr->result->set_lvalue( true );
                                 if ( ! inIntrinsic ) {
                                         // when not in an intrinsic function, add a cast to
@@ -436 +445 @@
                                 delete ret->result;
                                 ret->result = castExpr->result;
-                                ret->result->set_lvalue( true ); // ensure result is lvalue
+                                assert( ret->get_lvalue() ); // ensure result is lvalue
                                 castExpr->env = nullptr;
                                 castExpr->arg = nullptr;