Changeset 4067aa8

Timestamp:

Feb 23, 2016, 4:32:15 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:

b502055

Parents:

dc12481

Message:

Fix non-polymorphic members of polymorphic types (general case of Thierry's pointer bug)

File:

• src/GenPoly/Box.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -1448 +1448 @@
                         assert( newMemberExpr );
 
-                        // wrap pointer members in appropriate cast
-                        if ( dynamic_cast< PointerType* >( memberExpr->get_member()->get_type() ) ) {
-                                CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) ) );
+                        Type *memberType = memberExpr->get_member()->get_type();
+                        if ( ! isPolyType( memberType, scopeTyVars ) ) {
+                                // Not all members of a polymorphic type are themselves of polymorphic type; in this case the member expression should be wrapped and dereferenced to form an lvalue
+                                CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), memberType->clone() ) );
                                 UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                 derefExpr->get_args().push_back( ptrCastExpr );