Changeset c600df1

Timestamp:

Oct 26, 2021, 1:32:59 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

15885de9, 1ed9cb63

Parents:

148ba7d

Message:

Added ast::WithConstTranslationUnit? to give access to the surrounding TranslationUnit?.

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Pass.proto.hpp (modified) (1 diff)
• AST/TranslationUnit.hpp (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (2 diffs)

src/AST/Pass.hpp

@@ -396 +396 @@
 };
 
+/// Used to get a pointer to the wrapping TranslationUnit.
+struct WithConstTranslationUnit {
+        const TranslationUnit * translationUnit = nullptr;
+
+        const TranslationUnit & transUnit() const {
+                assertf( translationUnit, "WithConstTranslationUnit not set-up." );
+                return *translationUnit;
+        }
+};
+
 }
 

src/AST/Pass.impl.hpp

@@ -420 +420 @@
 template< typename core_t >
 inline void ast::accept_all( ast::TranslationUnit & unit, ast::Pass< core_t > & visitor ) {
-        return ast::accept_all( unit.decls, visitor );
+        if ( auto ptr = __pass::translation_unit::get_cptr( visitor.core, 0 ) ) {
+                ValueGuard<const TranslationUnit *> guard( *ptr );
+                *ptr = &unit;
+                return ast::accept_all( unit.decls, visitor );
+        } else {
+                return ast::accept_all( unit.decls, visitor );
+        }
 }
 

src/AST/Pass.proto.hpp

@@ -426 +426 @@
         } // namespace forall
 
+        // For passes that need access to the global context. Sreaches `translationUnit`
+        namespace translation_unit {
+                template<typename core_t>
+                static inline auto get_cptr( core_t & core, int )
+                                -> decltype( &core.translationUnit ) {
+                        return &core.translationUnit;
+                }
+
+                template<typename core_t>
+                static inline const TranslationUnit ** get_cptr( core_t &, long ) {
+                        return nullptr;
+                }
+        }
+
         template<typename core_t>
         static inline auto get_result( core_t & core, char ) -> decltype( core.result() ) {

src/AST/TranslationUnit.hpp

@@ -26 +26 @@
         std::list< ptr< Decl > > decls;
 
-        struct Globals {
+        struct Global {
                 std::map< UniqueId, Decl * > idMap;
 
-                const Type * sizeType;
+                ptr<Type> sizeType;
                 const FunctionDecl * dereference;
                 const StructDecl * dtorStruct;

src/InitTweak/GenInit.cc

@@ -300 +300 @@
         struct HoistArrayDimension_NoResolve_New final :
                         public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting,
-                        public ast::WithGuards,
+                        public ast::WithGuards, public ast::WithConstTranslationUnit,
                         public ast::WithVisitorRef<HoistArrayDimension_NoResolve_New> {
                 void previsit( const ast::ObjectDecl * decl );
@@ -342 +342 @@
                         }
 
-                        ast::ptr<ast::Type> dimType = ast::sizeType;
+                        ast::ptr<ast::Type> dimType = transUnit().global.sizeType;
                         assert( dimType );
                         add_qualifiers( dimType, ast::CV::Qualifiers( ast::CV::Const ) );