Changeset 64071c2 for src/CodeGen

Timestamp:

Jun 6, 2016, 2:16:00 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:

7baed7d

Parents:

321a2481

Message:

greatly simplify construction of qualified objects using cast expressions, which also reduces gcc warnings

File:

• src/CodeGen/CodeGenerator.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -257 +257 @@
                                 std::list< Expression* >::iterator arg = applicationExpr->get_args().begin();
                                 switch ( opInfo.type ) {
-                                  case OT_CTOR:
-                                  case OT_DTOR:
-                                        {
-                                                // if the first argument's type is const then GCC complains. In this
-                                                // case, output an explicit ctor/dtor call and exit, rather than following
-                                                // the normal path
-                                                assert( arg != applicationExpr->get_args().end() );
-                                                assert( (*arg)->get_results().size() >= 1 );
-                                                Type * baseType = InitTweak::getPointerBase( (*arg)->get_results().front() );
-                                                if ( baseType->get_isConst() ) {
-                                                        // cast away the qualifiers, to eliminate warnings
-                                                        Type * newType = baseType->clone();
-                                                        newType->get_qualifiers() = Type::Qualifiers();
-                                                        *arg = new CastExpr( *arg, new PointerType( Type::Qualifiers(), newType ) );
-                                                        varExpr->accept( *this );
-                                                        output << "(";
-                                                        genCommaList( applicationExpr->get_args().begin(), applicationExpr->get_args().end() );
-                                                        output << ")";
-                                                        return;
-                                                }
-                                        }
-                                        // intentional fallthrough - instrinsic ctor/dtor for non-const objects should
-                                        // be handled the same way as assignment
                                   case OT_PREFIXASSIGN:
                                   case OT_POSTFIXASSIGN:
                                   case OT_INFIXASSIGN:
+                                  case OT_CTOR:
+                                  case OT_DTOR:
                                         {
                                                 assert( arg != applicationExpr->get_args().end() );
@@ -324 +303 @@
                                         if ( applicationExpr->get_args().size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects - output as a void expression
-                                                output << "((void)(";
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
                                                 (*arg++)->accept( *this );
-                                                output << ")) /* " << opInfo.inputName << " */";
+                                                output << ") /* " << opInfo.inputName << " */";
                                         } else if ( applicationExpr->get_args().size() == 2 ) {
                                                 // intrinsic two parameter constructors are essentially bitwise assignment
@@ -409 +388 @@
                                         if ( untypedExpr->get_args().size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects - output as a void expression
-                                                output << "((void)(";
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
                                                 (*arg++)->accept( *this );
-                                                output << ")) /* " << opInfo.inputName << " */";
+                                                output << ") /* " << opInfo.inputName << " */";
                                         } else if ( untypedExpr->get_args().size() == 2 ) {
                                                 // intrinsic two parameter constructors are essentially bitwise assignment