Changeset 4318107

Timestamp:

Feb 18, 2016, 3:09:40 PM (8 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:

6ce67ce, dc12481

Parents:

30aeb27

Message:

Fix member expressions for polymorphic generic types where the member has pointer type

File:

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

src/GenPoly/Box.cc

@@ -1407 +1407 @@
                         if ( ! objectType ) return memberExpr;
 
+                        Expression *newMemberExpr = 0;
                         if ( StructInstType *structType = dynamic_cast< StructInstType* >( objectType ) ) {
                                 // look up offset index
@@ -1416 +1417 @@
                                 fieldLoc->get_args().push_back( makeDerefdVar( varExpr->clone(), varDepth ) );
                                 fieldLoc->get_args().push_back( makeOffsetIndex( objectType, i ) );
-
-                                delete memberExpr;
-                                return fieldLoc;
+                                newMemberExpr = fieldLoc;
                         } else if ( dynamic_cast< UnionInstType* >( objectType ) ) {
                                 // union members are all at offset zero, so build appropriately-dereferenced variable
-                                Expression *derefdVar = makeDerefdVar( varExpr->clone(), varDepth );
-                                delete memberExpr;
-                                return derefdVar;
+                                newMemberExpr = makeDerefdVar( varExpr->clone(), varDepth );
                         } else return memberExpr;
+                        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() ) ) ) );
+                                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                                derefExpr->get_args().push_back( ptrCastExpr );
+                                newMemberExpr = derefExpr;
+                        }
+
+                        delete memberExpr;
+                        return newMemberExpr;
                 }