Changeset 14c0f7b for src/Validate

Timestamp:

Jul 31, 2023, 11:25:51 AM (10 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

f496046

Parents:

e0332dd

Message:

Added invariant to check that referenced declarations are in scope. This one took a while, I don't remember why forall pointer decay is involved.

Location:

src/Validate

Files:

• Autogen.cpp (modified) (1 diff)
• FixQualifiedTypes.cpp (modified) (1 diff)
• ForallPointerDecay.cpp (modified) (2 diffs)
• ForallPointerDecay.hpp (modified) (1 diff)

src/Validate/Autogen.cpp

@@ -532 +532 @@
                 )
         );
-        return genImplicitCall(
+        auto stmt = genImplicitCall(
                 srcParam, dstSelect, location, func->name,
                 field, direction
         );
+        // This could return the above directly, except the generated code is
+        // built using the structure's members and that means all the scoped
+        // names (the forall parameters) are incorrect. This corrects them.
+        if ( stmt && !decl->params.empty() ) {
+                ast::DeclReplacer::TypeMap oldToNew;
+                for ( auto pair : group_iterate( decl->params, func->type_params ) ) {
+                        oldToNew.emplace( std::get<0>(pair), std::get<1>(pair) );
+                }
+                auto node = ast::DeclReplacer::replace( stmt, oldToNew );
+                stmt = strict_dynamic_cast<const ast::Stmt *>( node );
+        }
+        return stmt;
 }
 

src/Validate/FixQualifiedTypes.cpp

@@ -89 +89 @@
         }
 
-        ast::Expr const * postvisit( ast::QualifiedNameExpr const * t) {
+        ast::Expr const * postvisit( ast::QualifiedNameExpr const * t ) {
                 assert( location );
-                if ( t->type_decl ) {
-                auto enumName = t->type_decl->name;
-                const ast::EnumDecl * enumDecl = symtab.lookupEnum( enumName );
-                        for ( ast::ptr<ast::Decl> const & member : enumDecl->members ) {
-                                if ( auto memberAsObj = member.as<ast::ObjectDecl>() ) {
-                                        if ( memberAsObj->name == t->name ) {
-                                                return new ast::VariableExpr( t->location, memberAsObj );
-                                        }
-                                } else {
-                                        assertf( false, "unhandled qualified child type");
+                if ( !t->type_decl ) return t;
+
+                auto enumName = t->type_decl->name;
+                const ast::EnumDecl * enumDecl = symtab.lookupEnum( enumName );
+                for ( ast::ptr<ast::Decl> const & member : enumDecl->members ) {
+                        if ( auto memberAsObj = member.as<ast::ObjectDecl>() ) {
+                                if ( memberAsObj->name == t->name ) {
+                                        return new ast::VariableExpr( t->location, memberAsObj );
                                 }
+                        } else {
+                                assertf( false, "unhandled qualified child type" );
                         }
+                }
 
-                auto var = new ast::ObjectDecl( t->location, t->name,
-                        new ast::EnumInstType(enumDecl, ast::CV::Const), nullptr, {}, ast::Linkage::Cforall );
-                        var->mangleName = Mangle::mangle( var );
-                        return new ast::VariableExpr( t->location, var );
-        }
-
-                return t;
+                auto var = new ast::ObjectDecl( t->location, t->name,
+                        new ast::EnumInstType( enumDecl, ast::CV::Const ),
+                        nullptr, {}, ast::Linkage::Cforall );
+                var->mangleName = Mangle::mangle( var );
+                return new ast::VariableExpr( t->location, var );
         }
 

src/Validate/ForallPointerDecay.cpp

@@ -214 +214 @@
                 if ( dynamic_cast< const ast::FunctionType * >( type ) ) return;
                 SemanticError( obj->location,
-                        toCString( "operator ", obj->name.c_str(), " is not "
-                        "a function or function pointer." ) );
+                        toCString( "operator ", obj->name.c_str(),
+                        " is not a function or function pointer." ) );
         }
 };
@@ -237 +237 @@
         ast::Pass<AssertionFunctionFixer>::run( transUnit );
         ast::Pass<OperatorChecker>::run( transUnit );
+}
+
+void fixUniqueIds( ast::TranslationUnit & transUnit ) {
         ast::Pass<UniqueFixCore>::run( transUnit );
 }

src/Validate/ForallPointerDecay.hpp

@@ -27 +27 @@
 
 /// Cleans up assertion lists and expands traits.
-/// Also checks that operator names are used properly on functions and
-/// assigns unique IDs. This is a "legacy" pass.
+/// Also checks that operator names are used properly on functions.
+/// This is a "legacy" pass.
+/// Must happen before auto-gen routines are added.
+void decayForallPointers( ast::TranslationUnit & transUnit );
+
+/// Sets uniqueIds on any declarations that do not have one set.
 /// Must be after implement concurrent keywords; because uniqueIds must be
 /// set on declaration before resolution.
-/// Must happen before auto-gen routines are added.
-void decayForallPointers( ast::TranslationUnit & transUnit );
+void fixUniqueIds( ast::TranslationUnit & transUnit );
 
 /// Expand all traits in an assertion list.