Changeset 02ad3f5

Timestamp:

Apr 13, 2016, 5:40:28 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

b11fac4

Parents:

aa19ccf

Message:

Fix bug returning lvalue polymorphic type

File:

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

src/GenPoly/Lvalue.cc

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