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

File:

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

src/GenPoly/Lvalue.cc

@@ -21 +21 @@
 #include "Lvalue.h"
 
-#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/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
@@ -33 +33 @@
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
-#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 
 #if 0
@@ -45 +44 @@
                 // TODO: fold this into the general createDeref function??
                 Expression * mkDeref( Expression * arg ) {
-                        if ( Validate::dereferenceOperator ) {
+                        if ( SymTab::dereferenceOperator ) {
                                 // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-                                VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
+                                VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
                                 Type * base = InitTweak::getPointerBase( arg->result );
@@ -54 +53 @@
                                 delete ret->result;
                                 ret->result = base->clone();
+                                ret->result->set_lvalue( true );
                                 return ret;
                         } else {
@@ -146 +146 @@
 
         namespace {
-                // true for intrinsic function calls that return an lvalue in C
+                // true for intrinsic function calls that return a reference
                 bool isIntrinsicReference( Expression * expr ) {
-                        // known intrinsic-reference prelude functions
-                        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
                         if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * >( expr ) ) {
                                 std::string fname = InitTweak::getFunctionName( untyped );
-                                return lvalueFunctions.count(fname);
+                                // known intrinsic-reference prelude functions
+                                return fname == "*?" || fname == "?[?]";
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * > ( expr ) ) {
                                 if ( DeclarationWithType * func = InitTweak::getFunction( appExpr ) ) {
-                                        return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
+                                        // use type of return variable rather than expr result type, since it may have been changed to a pointer type
+                                        FunctionType * ftype = GenPoly::getFunctionType( func->get_type() );
+                                        Type * ret = ftype->returnVals.empty() ? nullptr : ftype->returnVals.front()->get_type();
+                                        return func->linkage == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
                                 }
                         }
@@ -166 +168 @@
                                 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
@@ -194 +197 @@
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->parameters.size();
-
-                                /// The for loop may eagerly dereference the iterators and fail on empty lists
-                                if(i == end) { return appExpr; }
                                 for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
+                                        if (i == end) break;
                                         Expression *& arg = std::get<0>( p );
                                         Type * formal = std::get<1>( p )->get_type();
@@ -211 +212 @@
                                                 // TODO: it's likely that the second condition should be ... && ! isIntrinsicReference( arg ), but this requires investigation.
 
-                                                if ( function->linkage != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
+                                                if ( function->get_linkage() != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
                                                         // needed for definition of prelude functions, etc.
                                                         // if argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
@@ -227 +228 @@
                                                         arg = new AddressExpr( arg );
                                                 // } else if ( function->get_linkage() == LinkageSpec::Intrinsic && InitTweak::getPointerBase( arg->result ) ) {
-                                                } else if ( function->linkage == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
                                                         // argument is a 'real' reference, but function expects a C lvalue: add a dereference to the reference-typed argument
                                                         PRINT(
@@ -242 +243 @@
                                         }
                                         ++i;
-                                        if (i == end) break;
                                 }
                         }
@@ -355 +355 @@
                         Type * destType = castExpr->result;
                         Type * srcType = castExpr->arg->result;
-                        assertf( destType, "Cast to no type in: %s", toCString( castExpr ) );
-                        assertf( srcType, "Cast from no type in: %s", toCString( castExpr ) );
                         int depth1 = destType->referenceDepth();
                         int depth2 = srcType->referenceDepth();
                         int diff = depth1 - depth2;
 
-                        if ( diff > 0 && ! castExpr->arg->get_lvalue() ) {
+                        if ( diff > 0 && ! srcType->get_lvalue() ) {
                                 // rvalue to reference conversion -- introduce temporary
                                 // know that reference depth of cast argument is 0, need to introduce n temporaries for reference depth of n, e.g.
@@ -405 +403 @@
                                         ret = new AddressExpr( ret );
                                 }
-                                if ( castExpr->arg->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
+                                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;
@@ -434 +432 @@
                                 delete ret->result;
                                 ret->result = castExpr->result;
-                                assert( ret->get_lvalue() ); // ensure result is lvalue
+                                ret->result->set_lvalue( true ); // ensure result is lvalue
                                 castExpr->env = nullptr;
                                 castExpr->arg = nullptr;