Changeset 0d7fc00

Timestamp:

Jul 14, 2023, 3:44:17 PM (10 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

dbf5e18

Parents:

c25f16b

Message:

This may fix the excessive 'struct _IO_FILE;' declarations. I still don't know how to replicate it on my machine.

File:

• src/Validate/LinkReferenceToTypes.cpp (modified) (5 diffs)

src/Validate/LinkReferenceToTypes.cpp

@@ -71 +71 @@
         /// The "leaveNamespace" is handled by guard.
         void enterNamespace();
-        /// Puts the decl on the back of declsToAddBefore once traversal is
+        /// Puts the decl on the back of declsToAddAfter once traversal is
         /// outside of any namespaces.
-        void addDeclBeforeOutside( ast::Decl const * );
+        void addDeclAfterOutside( ast::Decl const * );
 };
 
@@ -81 +81 @@
         GuardAction( [this](){
                 inNamespace = false;
-                declsToAddBefore.splice( declsToAddBefore.begin(), declsToAddOutside );
+                declsToAddAfter.splice( declsToAddAfter.begin(), declsToAddOutside );
         } );
 }
 
-void LinkTypesCore::addDeclBeforeOutside( ast::Decl const * decl ) {
+void LinkTypesCore::addDeclAfterOutside( ast::Decl const * decl ) {
         if ( inNamespace ) {
                 declsToAddOutside.emplace_back( decl );
         } else {
-                declsToAddBefore.emplace_back( decl );
+                declsToAddAfter.emplace_back( decl );
         }
 }
@@ -113 +113 @@
         if ( !decl || decl->location.isUnset() ) {
                 assert( location );
-                decl = new ast::EnumDecl( *location, type->name );
+                ast::EnumDecl * mut = new ast::EnumDecl( *location, type->name );
+                mut->linkage = ast::Linkage::Compiler;
+                decl = mut;
                 symtab.addEnum( decl );
-                addDeclBeforeOutside( decl );
+                addDeclAfterOutside( decl );
         }
 
@@ -135 +137 @@
         if ( !decl || decl->location.isUnset() ) {
                 assert( location );
-                decl = new ast::StructDecl( *location, type->name );
+                ast::StructDecl * mut = new ast::StructDecl( *location, type->name );
+                mut->linkage = ast::Linkage::Compiler;
+                decl = mut;
                 symtab.addStruct( decl );
-                addDeclBeforeOutside( decl );
+                addDeclAfterOutside( decl );
         }
 
@@ -157 +161 @@
         if ( !decl || decl->location.isUnset() ) {
                 assert( location );
-                decl = new ast::UnionDecl( *location, type->name );
+                ast::UnionDecl * mut = new ast::UnionDecl( *location, type->name );
+                mut->linkage = ast::Linkage::Compiler;
+                decl = mut;
                 symtab.addUnion( decl );
-                addDeclBeforeOutside( decl );
+                addDeclAfterOutside( decl );
         }