Changeset c2ce2350

Timestamp:

Apr 27, 2016, 5:11:26 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:

4ffdd63

Parents:

1b31345

git-author:

Rob Schluntz <rschlunt@…> (04/27/16 11:25:38)

git-committer:

Rob Schluntz <rschlunt@…> (04/27/16 17:11:26)

Message:

fix CodeGenerator? to output unresolved intrinsic constructor/destructor calls

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 17:10:21 2016
+// Last Modified On : Wed Apr 27 11:59:36 2016
 // Update Count     : 255
 //
@@ -239 +239 @@
                                   case OT_INFIXASSIGN:
                                   case OT_CTOR:
+                                  case OT_DTOR:
                                         {
                                                 assert( arg != applicationExpr->get_args().end() );
@@ -273 +274 @@
 
                                   case OT_CTOR:
+                                  case OT_DTOR:
                                         if ( applicationExpr->get_args().size() == 1 ) {
-                                                // the expression fed into a single parameter constructor may contain
-                                                // side effects - output as a void expression
+                                                // 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 << ")) /* ?{} */";
+                                                output << ")) /* " << opInfo.inputName << " */";
                                         } else if ( applicationExpr->get_args().size() == 2 ) {
-                                                // intrinsic constructors are essentially bitwise assignment
+                                                // intrinsic two parameter constructors are essentially bitwise assignment
                                                 output << "(";
                                                 (*arg++)->accept( *this );
                                                 output << opInfo.symbol;
                                                 (*arg)->accept( *this );
-                                                output << ") /* ?{} */";
+                                                output << ") /* " << opInfo.inputName << " */";
                                         } else {
-                                                // not constructors with 0 or more than 2 parameters
+                                                // no constructors with 0 or more than 2 parameters
                                                 assert( false );
                                         }
                                         break;
-
-                                  case OT_DTOR:
-                                  // intrinsic destructors do nothing - don't generate any code
-                                  output << " /* " << dynamic_cast<VariableExpr*>(applicationExpr->get_function())->get_var()->get_name() << " */";
-                                  break;
 
                                   case OT_PREFIX:
@@ -360 +357 @@
                                         assert( false );
 
-                                        case OT_CTOR:
-                                        case OT_DTOR:
-                                        // intrinsic constructors should never be called
-                                        // intrinsic destructors do nothing
+
+                                  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;