Changeset 10a7775 for src/ResolvExpr

Timestamp:

Jun 3, 2016, 2:02:29 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, 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, with_gc

Children:

e365cb5

Parents:

e01bfbc

Message:

can use intrinsic constructors on const objects

File:

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

src/ResolvExpr/Resolver.cc

@@ -531 +531 @@
                         assert( dynamic_cast< VariableExpr * >( arr ) );
                         assert( arr && arr->get_results().size() == 1 );
-                        ArrayType * arrType = dynamic_cast< ArrayType * >( arr->get_results().front() );
-                        assert( arrType );
-                        type = arrType->get_base();
+                        type = InitTweak::getPointerBase( arr->get_results().front() );
+                        assert( type );
                 } else {
                         // otherwise, constructing a plain object, which means the object's address is being taken.
@@ -557 +556 @@
                 impCtorDtorStmt->get_callStmt()->accept( *this );
 
-                // and reset type qualifiers after resolving
-                type->get_qualifiers() = qualifiers;
+                // reset type qualifiers, but first need to figure out where everything is again
+                // because the expressions are often changed by the resolver.
+                callExpr = InitTweak::getCtorDtorCall( impCtorDtorStmt );
+                assert( callExpr );
+                constructee = InitTweak::getCallArg( callExpr, 0 );
+                if ( ApplicationExpr * plusExpr = dynamic_cast< ApplicationExpr * >( 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 ) );
+                        assert( arr && arr->get_results().size() == 1 );
+                        type = InitTweak::getPointerBase( arr->get_results().front() );
+                        assert( type );
+                        type->get_qualifiers() = qualifiers;
+                } else {
+                        // otherwise constructing a plain object
+                        // replace qualifiers on AddressExpr and on inner VariableExpr
+                        assert( constructee->get_results().size() == 1 );
+                        AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
+                        assert( addrExpr );
+                        type = InitTweak::getPointerBase( addrExpr->get_results().front() );
+                        assert( type );
+                        type->get_qualifiers() = qualifiers;
+
+                        VariableExpr * varExpr = dynamic_cast< VariableExpr * >( addrExpr->get_arg() );
+                        assert( varExpr && varExpr->get_results().size() == 1 );
+                        type = varExpr->get_results().front();
+                        type->get_qualifiers() = qualifiers;
+                }
         }
 } // namespace ResolvExpr