Changeset e14d169

Timestamp:

Oct 16, 2023, 1:56:40 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4d2d7e27, 52a5262e

Parents:

6bd9f9e

Message:

Remove some cruft from the box pass. Some pieces left over from earlier versions that are no longer needed and some rejected notes.

File:

• src/GenPoly/BoxNew.cpp (modified) (11 diffs)

src/GenPoly/BoxNew.cpp

@@ -376 +376 @@
         ast::Expr const * postvisit( ast::AddressExpr const * expr );
         ast::ReturnStmt const * previsit( ast::ReturnStmt const * stmt );
-        void previsit( ast::PointerType const * type );
-        void previsit( ast::FunctionType const * type );
 
         void beginScope();
@@ -553 +551 @@
 
 ast::FunctionDecl const * CallAdapter::previsit( ast::FunctionDecl const * decl ) {
+        // Prevent type declaration information from leaking out.
+        GuardScope( scopeTypeVars );
+
         if ( nullptr == decl->stmts ) {
-                // This may keep TypeDecls we don't ever want from sneaking in.
-                // Not visiting child nodes might just be faster.
-                GuardScope( scopeTypeVars );
                 return decl;
         }
 
-        GuardScope( scopeTypeVars );
         GuardValue( retval );
 
@@ -687 +684 @@
 
         assert( typeSubs );
-        ast::Type const * concRetType = replaceWithConcrete( dynRetType, *typeSubs );
-        // Used to use dynRetType instead of concRetType; this changed so that
-        // the correct type parameters are passed for return types (it should be
-        // the concrete type's parameters, not the formal type's).
         ast::vector<ast::Expr>::iterator argIt =
                 passTypeVars( mutExpr, function );
@@ -768 +761 @@
         }
         return stmt;
-}
-
-void CallAdapter::previsit( ast::PointerType const * type ) {
-        GuardScope( scopeTypeVars );
-        makeTypeVarMap( type, scopeTypeVars );
-}
-
-void CallAdapter::previsit( ast::FunctionType const * type ) {
-        GuardScope( scopeTypeVars );
-        makeTypeVarMap( type, scopeTypeVars );
 }
 
@@ -1595 +1578 @@
         PolyGenericCalculator();
 
-        void previsit( ast::ObjectDecl const * decl );
         void previsit( ast::FunctionDecl const * decl );
         void previsit( ast::TypedefDecl const * decl );
@@ -1602 +1584 @@
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
         ast::UnionDecl const * previsit( ast::UnionDecl const * decl );
-        void previsit( ast::PointerType const * type );
-        void previsit( ast::FunctionType const * type );
         ast::DeclStmt const * previsit( ast::DeclStmt const * stmt );
         ast::Expr const * postvisit( ast::MemberExpr const * expr );
@@ -1639 +1619 @@
         /// adding the type variables from the provided type.
         void beginTypeScope( ast::Type const * );
-        /// Enters a new scope for known layouts and offsets, and queues exit calls.
-        void beginGenericScope();
 
         /// Set of generic type layouts known in the current scope,
@@ -1652 +1630 @@
         /// If the argument of an AddressExpr is MemberExpr, it is stored here.
         ast::MemberExpr const * addrMember = nullptr;
-        /// Used to avoid recursing too deep in type declarations.
-        bool expect_func_type = false;
 };
 
@@ -1675 +1651 @@
 }
 
-void PolyGenericCalculator::previsit( ast::ObjectDecl const * decl ) {
-        beginTypeScope( decl->type );
-}
-
 void PolyGenericCalculator::previsit( ast::FunctionDecl const * decl ) {
-        beginGenericScope();
+        GuardScope( *this );
         beginTypeScope( decl->type );
 }
@@ -1742 +1714 @@
 }
 
-void PolyGenericCalculator::previsit( ast::PointerType const * type ) {
-        beginTypeScope( type );
-}
-
-void PolyGenericCalculator::previsit( ast::FunctionType const * type ) {
-        beginTypeScope( type );
-
-        GuardValue( expect_func_type );
-        GuardScope( *this );
-
-        // The other functions type we will see in this scope are probably
-        // function parameters they don't help us with the layout and offsets so
-        // don't mark them as known in this scope.
-        expect_func_type = false;
-}
-
-//void PolyGenericCalculator::previsit( ast::DeclStmt const * stmt ) {
 ast::DeclStmt const * PolyGenericCalculator::previsit( ast::DeclStmt const * stmt ) {
         ast::ObjectDecl const * decl = stmt->decl.as<ast::ObjectDecl>();
@@ -2248 +2203 @@
 }
 
-void PolyGenericCalculator::beginGenericScope() {
-        GuardScope( *this );
-        // We expect the first function type see to be the type relating to this
-        // scope but any further type is probably some unrelated function pointer
-        // keep track of whrich is the first.
-        GuardValue( expect_func_type ) = true;
-}
-
 // --------------------------------------------------------------------------
-/// No common theme found.
+/// Removes unneeded or incorrect type information.
 /// * Replaces initialization of polymorphic values with alloca.
 /// * Replaces declaration of dtype/ftype with appropriate void expression.