Changeset b1e63ac5 for src/MakeLibCfa.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into references

File:

• src/MakeLibCfa.cc (modified) (2 diffs)

src/MakeLibCfa.cc

@@ -75 +75 @@
                   case CodeGen::OT_POSTFIXASSIGN:
                   case CodeGen::OT_INFIXASSIGN:
+                  case CodeGen::OT_CTOR:
+                  case CodeGen::OT_DTOR:
                                 funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
                                 break;
-                  case CodeGen::OT_CTOR:
-                        // ctors don't return a value
-                        if ( funcDecl->get_functionType()->get_parameters().size() == 1 ) {
-                                // intrinsic default constructors should do nothing
-                                // delete newExpr;
-                                break;
-                        } else {
-                                assert( funcDecl->get_functionType()->get_parameters().size() == 2 );
-                                // anything else is a single parameter constructor that is effectively a C-style assignment
-                                // delete newExpr->get_function();
-                                assert(newExpr->get_args().size()==2);
-                                newExpr->set_function( new NameExpr( "?=?" ) );
-                                funcDecl->get_statements()->get_kids().push_back( new ExprStmt( std::list< Label >(), newExpr ) );
-                        }
-                        break;
-                  case CodeGen::OT_DTOR:
-                        // intrinsic destructors should do nothing
-                        // delete newExpr;
-                        break;
                   case CodeGen::OT_CONSTANT:
                   case CodeGen::OT_LABELADDRESS:
@@ -109 +92 @@
                 assert( ! objDecl->get_init() );
                 std::list< Expression* > noDesignators;
-                objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), noDesignators, false ) ); // cannot be constructed
+                objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), false ) ); // cannot be constructed
                 newDecls.push_back( objDecl );
         }