Changeset 10a7775 for src/CodeGen

Timestamp:

Jun 3, 2016, 2:02:29 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, 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/CodeGen/CodeGenerator.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc ¶

@@ -33 +33 @@
 #include "OperatorTable.h"
 #include "GenType.h"
+
+#include "InitTweak/InitTweak.h"
 
 using namespace std;
@@ -255 +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() );
@@ -269 +292 @@
                                                         UntypedExpr *newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
+                                                        assert( (*arg)->get_results().size() == 1 );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
+                                                        assert( type );
+                                                        newExpr->get_results().push_back( type );
                                                         *arg = newExpr;
                                                 } // if