Changeset f1e012b for src/ResolvExpr/Resolver.cc

Timestamp:

Jan 19, 2016, 1:28:25 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:

ca1c11f

Parents:

71f4e4f

Message:

added intrinsic ctor/dtors to prelude, modified MakeLibCfa? to build prelude ctor/dtors, added ctor/dtor to polymorphic object type constraints, rudimentary fallback on initializer nodes if chosen ctor is intrinsic, remove intrinsic destructor statements to reduce output pollution

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 16:23:51 2016
-// Update Count     : 186
+// Last Modified On : Thu Jan 14 16:45:32 2016
+// Update Count     : 203
 //
 
@@ -60 +60 @@
           void resolveAggrInit( AggregateDecl *, InitIterator &, InitIterator & );
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
+          void fallbackInit( ConstructorInit * ctorInit );
 
                 std::list< Type * > functionReturn;
@@ -467 +468 @@
         }
 
+        // ConstructorInit - fall back on C-style initializer
+        void Resolver::fallbackInit( ConstructorInit * ctorInit ) {
+                // could not find valid constructor, or found an intrinsic constructor
+                // fall back on C-style initializer
+                delete ctorInit->get_ctor();
+                ctorInit->set_ctor( NULL );
+                maybeAccept( ctorInit->get_init(), *this );
+        }
+
         void Resolver::visit( ConstructorInit *ctorInit ) {
                 TypeEnvironment env;
                 AlternativeFinder finder( *this, env );
                 finder.find( ctorInit->get_ctor() );
+
                 if ( finder.get_alternatives().size() == 0 ) {
-                        // could not find valid constructor
-                        delete ctorInit->get_ctor();
-                        ctorInit->set_ctor( NULL );
-
-                        maybeAccept( ctorInit->get_init(), *this );
+                        fallbackInit( ctorInit );
                 } else if ( finder.get_alternatives().size() == 1 ) {
+                        Alternative &choice = finder.get_alternatives().front();
+                        if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( choice.expr ) ) {
+                                if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
+                                        if ( function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
+                                                // if the constructor that was found is intrinsic, reset to C-style
+                                                // initializer so that code generation is easy to handle
+                                                fallbackInit( ctorInit );
+                                                return;
+                                        }
+                                }
+                        }
                         // found a constructor - can get rid of C-style initializer
-                        Alternative &choice = finder.get_alternatives().front();
                         Expression *newExpr = choice.expr->clone();
                         finishExpr( newExpr, choice.env );