Changes in src/CodeGen/CodeGenerator.cc [03e5d14:10a7775]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:40:35 2016
-// Update Count     : 243
+// Last Modified On : Fri May 06 16:01:00 2016
+// Update Count     : 255
 //
 
@@ -34 +34 @@
 #include "GenType.h"
 
+#include "InitTweak/InitTweak.h"
+
 using namespace std;
 
@@ -67 +69 @@
         string mangleName( DeclarationWithType *decl ) {
                 if ( decl->get_mangleName() != "" ) {
-                        return decl->get_mangleName();
+                        // need to incorporate scope level in order to differentiate names for destructors
+                        return decl->get_scopedMangleName();
                 } else {
                         return decl->get_name();
@@ -233 +236 @@
                 printDesignators( init->get_designators() );
                 output << "{ ";
-                genCommaList( init->begin_initializers(), init->end_initializers() );
+                if ( init->begin_initializers() == init->end_initializers() ) {
+                        // illegal to leave initializer list empty for scalar initializers,
+                        // but always legal to have 0
+                        output << "0";
+                } else {
+                        genCommaList( init->begin_initializers(), init->end_initializers() );
+                }
                 output << " }";
         }
@@ -248 +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:
@@ -254 +286 @@
                                                 assert( arg != applicationExpr->get_args().end() );
                                                 if ( AddressExpr *addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
-
+                                                        // remove & from first assignment/ctor argument
                                                         *arg = addrExpr->get_arg();
                                                 } else {
+                                                        // no address-of operator, so must be a pointer - add dereference
                                                         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
@@ -283 +320 @@
                                         break;
 
+                                  case OT_CTOR:
+                                  case OT_DTOR:
+                                        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)(";
+                                                (*arg++)->accept( *this );
+                                                output << ")) /* " << opInfo.inputName << " */";
+                                        } else if ( applicationExpr->get_args().size() == 2 ) {
+                                                // intrinsic two parameter constructors are essentially bitwise assignment
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << opInfo.symbol;
+                                                (*arg)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else {
+                                                // no constructors with 0 or more than 2 parameters
+                                                assert( false );
+                                        }
+                                        break;
+
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
@@ -298 +356 @@
                                         output << opInfo.symbol;
                                         break;
+
 
                                   case OT_INFIX:
@@ -344 +403 @@
                                   case OT_CALL:
                                         assert( false );
+
+
+                                  case OT_CTOR:
+                                  case OT_DTOR:
+                                        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)(";
+                                                (*arg++)->accept( *this );
+                                                output << ")) /* " << opInfo.inputName << " */";
+                                        } else if ( untypedExpr->get_args().size() == 2 ) {
+                                                // intrinsic two parameter constructors are essentially bitwise assignment
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << opInfo.symbol;
+                                                (*arg)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else {
+                                                // no constructors with 0 or more than 2 parameters
+                                                assert( false );
+                                        }
                                         break;