Changeset 2be1023 for src/ResolvExpr/Resolver.cc

Timestamp:

Jul 18, 2016, 4:13:51 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

5f98ce5

Parents:

956a9c7

Message:

rework ctor/dtor generation to work properly with multidimensional arrays

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -537 +537 @@
                 assert( callExpr );
                 Expression *& constructee = InitTweak::getCallArg( callExpr, 0 );
-                Type * type = 0;
-
-                // need to find the type of the first argument, which is unfortunately not uniform since array construction
-                // includes an untyped '+' expression.
-                if ( UntypedExpr * plusExpr = dynamic_cast< UntypedExpr * >( constructee ) ) {
-                        // constructee is <array>+<index>
-                        // get Variable <array>, then get the base type of the VariableExpr - this is the type that needs to be fixed
-                        Expression * arr = InitTweak::getCallArg( plusExpr, 0 );
-                        assert( dynamic_cast< VariableExpr * >( arr ) || dynamic_cast< MemberExpr *>( arr ) );
-                        assert( arr && arr->get_results().size() == 1 );
-                        type = arr->get_results().front()->clone();
-                } else {
-                        // otherwise, constructing a plain object, which means the object's address is being taken.
-                        // Need to get the type of the VariableExpr object, because the AddressExpr is rebuilt and uses the
-                        // type of the VariableExpr to do so.
-                        assert( constructee->get_results().size() == 1 );
-                        AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
-                        assert( addrExpr && addrExpr->get_results().size() == 1 );
-                        type = addrExpr->get_results().front()->clone();
-                }
+
+                // the first argument will always be &<expr>
+                AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
+                assert( addrExpr );
+
+                // need to find the type of the first argument. In the case of an array,
+                // need to remove one ArrayType layer from the type for each subscript expression.
+                Expression * addressee = addrExpr->get_arg();
+                int numLayers = 0;
+                while ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( addressee ) ) {
+                        assert( InitTweak::getFunctionName( untypedExpr ) == "?[?]" );
+                        addressee = InitTweak::getCallArg( untypedExpr, 0 );
+                        numLayers++;
+                }
+                assert( addressee->get_results().size() == 1 );
+                Type * type = addressee->get_results().front();
+                for ( int i = 0; i < numLayers; i++ ) {
+                        type = InitTweak::getPointerBase( type );
+                        assert( type && "Expected pointer or array type. May have generated too many ?[?] calls." );
+                }
+
                 // cast to T* with qualifiers removed.
                 // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
@@ -562 +563 @@
                 // remove lvalue as a qualifier, this can change to
                 //   type->get_qualifiers() = Type::Qualifiers();
-                Type * base = InitTweak::getPointerBase( type );
-                assert( base );
-                base->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, true);
-                // if pointer has lvalue qualifier, cast won't appear in output
-                type->set_isLvalue( false );
+                assert( type );
+                type = type->clone();
+                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, true);
+                type = new PointerType( Type::Qualifiers(), type );
                 constructee = new CastExpr( constructee, type );