Changeset 4d2434a for src/ResolvExpr

Timestamp:

Aug 2, 2016, 6:37:08 PM (9 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:

8a443f4

Parents:

39f84a4

Message:

major reorganization of constructor generation from initializer list so that it now works with multi-dimensional arrays

File:

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

src/ResolvExpr/Resolver.cc ¶

@@ -54 +54 @@
                 virtual void visit( BranchStmt *branchStmt );
                 virtual void visit( ReturnStmt *returnStmt );
-                virtual void visit( ImplicitCtorDtorStmt * impCtorDtorStmt );
 
                 virtual void visit( SingleInit *singleInit );
@@ -436 +435 @@
 
         void Resolver::visit( ListInit * listInit ) {
-                InitIterator iter = listInit->begin_initializers();
-                InitIterator end = listInit->end_initializers();
+                InitIterator iter = listInit->begin();
+                InitIterator end = listInit->end();
 
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
@@ -539 +538 @@
                         ctorInit->set_ctor( NULL );
                 }
-                if ( InitTweak::isInstrinsicSingleArgCallStmt( ctorInit->get_ctor() ) ) {
+                if ( InitTweak::isInstrinsicSingleArgCallStmt( ctorInit->get_dtor() ) ) {
                         delete ctorInit->get_dtor();
                         ctorInit->set_dtor( NULL );
                 }
-        }
-
-        void Resolver::visit( ImplicitCtorDtorStmt * impCtorDtorStmt ) {
-                // before resolving ctor/dtor, need to remove type qualifiers from the first argument (the object being constructed).
-                // Do this through a cast expression to greatly simplify the code.
-                Expression * callExpr = InitTweak::getCtorDtorCall( impCtorDtorStmt );
-                assert( callExpr );
-                Expression *& constructee = InitTweak::getCallArg( callExpr, 0 );
-
-                // 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
-                // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
-                // remove lvalue as a qualifier, this can change to
-                //   type->get_qualifiers() = Type::Qualifiers();
-                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 );
-
-                // finally, resolve the ctor/dtor
-                impCtorDtorStmt->get_callStmt()->accept( *this );
         }
 } // namespace ResolvExpr