Changes in src/GenPoly/Lvalue.cc [baba5d8:d3b7937]

File:

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

src/GenPoly/Lvalue.cc

@@ -17 +17 @@
 
 #include "Lvalue.h"
-
-#include "GenPoly.h"
 
 #include "SynTree/Declaration.h"
@@ -65 +63 @@
 
         namespace {
-                Type* isLvalueRet( FunctionType *function ) {
-                        if ( function->get_returnVals().empty() ) return 0;
-                        Type *ty = function->get_returnVals().front()->get_type();
-                        return ty->get_isLvalue() ? ty : 0;
+                bool isLvalueRet( FunctionType *function ) {
+                        if ( ! function->get_returnVals().empty() ) {
+                                return function->get_returnVals().front()->get_type()->get_isLvalue();
+                        } else {
+                                return false;
+                        } // if
                 }
 
@@ -107 +107 @@
                         assert( function );
 
-                        Type *funType = isLvalueRet( function );
-                        if ( funType && ! isIntrinsicApp( appExpr ) ) {
-                                Expression *expr = appExpr;
-                                Type *appType = appExpr->get_results().front();
-                                if ( isPolyType( funType ) && ! isPolyType( appType ) ) {
-                                        // make sure cast for polymorphic type is inside dereference
-                                        expr = new CastExpr( appExpr, new PointerType( Type::Qualifiers(), appType->clone() ) );
-                                }
+                        std::string typeName;
+                        if ( isLvalueRet( function ) && ! isIntrinsicApp( appExpr ) ) {
                                 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->get_results().push_back( appType->clone() );
-                                appExpr->get_results().front() = new PointerType( Type::Qualifiers(), appType );
-                                deref->get_args().push_back( expr );
+                                deref->get_results().push_back( appExpr->get_results().front() );
+                                appExpr->get_results().front() = new PointerType( Type::Qualifiers(), deref->get_results().front()->clone() );
+                                deref->get_args().push_back( appExpr );
                                 return deref;
                         } else {