Changeset bfd4974 for src/InitTweak

Timestamp:

Oct 19, 2017, 11:13:12 AM (7 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:

21ea170

Parents:

189d800

git-author:

Rob Schluntz <rschlunt@…> (10/12/17 15:50:44)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:13:12)

Message:

Refactor ManagedTypes? code from CtorDtor?

Location:

src/InitTweak

Files:

• GenInit.cc (modified) (9 diffs)
• GenInit.h (modified) (2 diffs)

src/InitTweak/GenInit.cc

@@ -85 +85 @@
                 // should not have a ConstructorInit generated.
 
-                bool isManaged( ObjectDecl * objDecl ) const ; // determine if object is managed
-                bool isManaged( Type * type ) const; // determine if type is managed
-                void handleDWT( DeclarationWithType * dwt ); // add type to managed if ctor/dtor
-                GenPoly::ScopedSet< std::string > managedTypes;
+                ManagedTypes managedTypes;
                 bool inFunction = false;
         };
@@ -204 +201 @@
         }
 
-        bool CtorDtor::isManaged( Type * type ) const {
+        bool ManagedTypes::isManaged( Type * type ) const {
                 // references are never constructed
                 if ( dynamic_cast< ReferenceType * >( type ) ) return false;
@@ -220 +217 @@
         }
 
-        bool CtorDtor::isManaged( ObjectDecl * objDecl ) const {
+        bool ManagedTypes::isManaged( ObjectDecl * objDecl ) const {
                 Type * type = objDecl->get_type();
                 while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
@@ -228 +225 @@
         }
 
-        void CtorDtor::handleDWT( DeclarationWithType * dwt ) {
+        void ManagedTypes::handleDWT( DeclarationWithType * dwt ) {
                 // if this function is a user-defined constructor or destructor, mark down the type as "managed"
                 if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && CodeGen::isCtorDtor( dwt->get_name() ) ) {
@@ -238 +235 @@
                 }
         }
+
+        void ManagedTypes::handleStruct( StructDecl * aggregateDecl ) {
+                // don't construct members, but need to take note if there is a managed member,
+                // because that means that this type is also managed
+                for ( Declaration * member : aggregateDecl->get_members() ) {
+                        if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
+                                if ( isManaged( field ) ) {
+                                        StructInstType inst( Type::Qualifiers(), aggregateDecl );
+                                        managedTypes.insert( SymTab::Mangler::mangle( &inst ) );
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        void ManagedTypes::beginScope() { managedTypes.beginScope(); }
+        void ManagedTypes::endScope() { managedTypes.endScope(); }
 
         ImplicitCtorDtorStmt * genCtorDtor( const std::string & fname, ObjectDecl * objDecl, Expression * arg ) {
@@ -282 +296 @@
 
         void CtorDtor::previsit( ObjectDecl * objDecl ) {
-                handleDWT( objDecl );
+                managedTypes.handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
                 // even if unmanaged, try to construct global or static if initializer is not constexpr, since this is not legal C
-                if ( tryConstruct( objDecl ) && ( isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
+                if ( tryConstruct( objDecl ) && ( managedTypes.isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
                         if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl );
@@ -300 +314 @@
                 inFunction = true;
 
-                handleDWT( functionDecl );
+                managedTypes.handleDWT( functionDecl );
 
                 GuardScope( managedTypes );
@@ -306 +320 @@
                 for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
                         for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
-                                handleDWT( assertion );
+                                managedTypes.handleDWT( assertion );
                         }
                 }
@@ -316 +330 @@
                 visit_children = false; // do not try to construct and destruct aggregate members
 
-                // don't construct members, but need to take note if there is a managed member,
-                // because that means that this type is also managed
-                for ( Declaration * member : aggregateDecl->get_members() ) {
-                        if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
-                                if ( isManaged( field ) ) {
-                                        StructInstType inst( Type::Qualifiers(), aggregateDecl );
-                                        managedTypes.insert( SymTab::Mangler::mangle( &inst ) );
-                                        break;
-                                }
-                        }
-                }
+                managedTypes.handleStruct( aggregateDecl );
         }
 

src/InitTweak/GenInit.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>               // for list
-#include <string>             // for string
+#include <list>                // for list
+#include <string>              // for string
 
-#include "SynTree/SynTree.h"  // for Visitor Nodes
+#include "SynTree/SynTree.h"   // for Visitor Nodes
+
+#include "GenPoly/ScopedSet.h" // for ScopedSet
 
 namespace InitTweak {
@@ -33 +35 @@
         /// creates an appropriate ConstructorInit node which contains a constructor, destructor, and C-initializer
         ConstructorInit * genCtorInit( ObjectDecl * objDecl );
+
+        class ManagedTypes {
+        public:
+                bool isManaged( ObjectDecl * objDecl ) const ; // determine if object is managed
+                bool isManaged( Type * type ) const; // determine if type is managed
+
+                void handleDWT( DeclarationWithType * dwt ); // add type to managed if ctor/dtor
+                void handleStruct( StructDecl * aggregateDecl ); // add type to managed if child is managed
+
+                void beginScope();
+                void endScope();
+        private:
+                GenPoly::ScopedSet< std::string > managedTypes;
+        };
 } // namespace