Changeset aa19ccf

Timestamp:

Apr 13, 2016, 3:02:30 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

02ad3f5

Parents:

3849857

Message:

Box no longer marks generic type layouts calculated past scope of declaration

File:

• src/GenPoly/Box.cc (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -292 +292 @@
                         /// adds type parameters to the layout call; will generate the appropriate parameters if needed
                         void addOtypeParamsToLayoutCall( UntypedExpr *layoutCall, const std::list< Type* > &otypeParams );
+
+                        /// Enters a new scope for type-variables, adding the type variables from ty
+                        void beginTypeScope( Type *ty );
+                        /// Exits the type-variable scope
+                        void endTypeScope();
                         
                         ScopedSet< std::string > knownLayouts;          ///< Set of generic type layouts known in the current scope, indexed by sizeofName
@@ -1821 +1826 @@
 ////////////////////////////////////////// PolyGenericCalculator ////////////////////////////////////////////////////
 
+                void PolyGenericCalculator::beginTypeScope( Type *ty ) {
+                        scopeTyVars.beginScope();
+                        makeTyVarMap( ty, scopeTyVars );
+                }
+
+                void PolyGenericCalculator::endTypeScope() {
+                        scopeTyVars.endScope();
+                }
+
                 template< typename DeclClass >
                 DeclClass * PolyGenericCalculator::handleDecl( DeclClass *decl, Type *type ) {
-                        scopeTyVars.beginScope();
-                        makeTyVarMap( type, scopeTyVars );
+                        beginTypeScope( type );
+                        knownLayouts.beginScope();
+                        knownOffsets.beginScope();
 
                         DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
 
-                        scopeTyVars.endScope();
+                        knownOffsets.endScope();
+                        knownLayouts.endScope();
+                        endTypeScope();
                         return ret;
                 }
@@ -1850 +1867 @@
 
                 Type * PolyGenericCalculator::mutate( PointerType *pointerType ) {
-                        scopeTyVars.beginScope();
-                        makeTyVarMap( pointerType, scopeTyVars );
+                        beginTypeScope( pointerType );
 
                         Type *ret = Mutator::mutate( pointerType );
 
-                        scopeTyVars.endScope();
+                        endTypeScope();
                         return ret;
                 }
 
                 Type * PolyGenericCalculator::mutate( FunctionType *funcType ) {
-                        scopeTyVars.beginScope();
-                        makeTyVarMap( funcType, scopeTyVars );
+                        beginTypeScope( funcType );
 
                         // make sure that any type information passed into the function is accounted for
@@ -1874 +1889 @@
                         Type *ret = Mutator::mutate( funcType );
 
-                        scopeTyVars.endScope();
+                        endTypeScope();
                         return ret;
                 }