Changeset 795d450

Timestamp:

Jul 18, 2017, 4:20:02 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

242a902

Parents:

e6cee92

Message:

Correct the expression type after boxing intrinsic dereference to the argument base type

File:

• src/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -607 +607 @@
                                                 }
                                         } else {
-                                                throw SemanticError( "Cannot pass non-struct type for generic struct" );
+                                                throw SemanticError( "Cannot pass non-struct type for generic struct: ", argBaseType );
                                         }
                                 }
@@ -1040 +1040 @@
                                                         // remove dereference from polymorphic types since they are boxed.
                                                         Expression *ret = appExpr->get_args().front();
+                                                        // fix expr type to remove reference
                                                         delete ret->get_result();
-                                                        ret->set_result( appExpr->get_result()->clone() );
+                                                        Type * baseType = InitTweak::getPointerBase( appExpr->get_result() );
+                                                        assert( baseType );
+                                                        ret->set_result( baseType->clone() );
                                                         if ( appExpr->get_env() ) {
                                                                 ret->set_env( appExpr->get_env() );