Revert "compiler: refactor build queue"

This reverts commit 40403e7, which
fixes a regression sometimes making subsequent builds unstable.

Let's revert for now so we can finish the new beta release of Fuse X.

Author: mortend

src/compiler/core/Compiler.cs

@@ -49,7 +49,6 @@ public class Compiler : LogObject, ICompiler, IScheduler
         public readonly NameResolver NameResolver;
 
         // Building
-        public readonly BuildQueue Queue;
         public readonly BlockBuilder BlockBuilder;
         public readonly BundleBuilder BundleBuilder;
         public readonly TypeBuilder TypeBuilder;
@@ -92,9 +91,8 @@ public Compiler(Log log, Backend backend, SourceBundle bundle, CompilerOptions o
             var data = Data = new BuildData(il, extensions, ilf);
             var environment = Environment = new BuildEnvironment(backend, bundle, options, extensions, ilf, this);
             var input = Input = new SourceReader(log, bundle, environment);
-            var queue = Queue = new BuildQueue(log, environment, backend, this);
-            var blockBuilder = BlockBuilder = new BlockBuilder(backend, il, ilf, resolver, this, queue);
-            var typeBuilder = TypeBuilder = new TypeBuilder(environment, ilf, resolver, this, queue);
+            var blockBuilder = BlockBuilder = new BlockBuilder(backend, il, ilf, resolver, this);
+            var typeBuilder = TypeBuilder = new TypeBuilder(environment, ilf, resolver, this);
             BundleBuilder = new BundleBuilder(backend, environment, ilf, this);
             AstProcessor = new AstProcessor(il, blockBuilder, typeBuilder, resolver, environment);
             UxlProcessor = new UxlProcessor(disk, backend.Name, il, extensions, environment, ilf);
@@ -134,23 +132,20 @@ public void Compile()
                 if (Backend.CanLink(bundle))
                     bundle.Flags |= SourceBundleFlags.CanLink;
 
-            using (Log.StartProfiler(Queue))
-                Queue.BuildTypesAndFunctions();
-
+            using (Log.StartProfiler(TypeBuilder))
+                TypeBuilder.Build();
             if (Log.HasErrors)
                 return;
 
-            using (Log.StartProfiler(UxlProcessor))
-                UxlProcessor.CompileDocuments();
+            Backend.ShaderBackend.Initialize(this, BundleBuilder);
 
+            using (Log.StartProfiler(BlockBuilder))
+                BlockBuilder.Build();
             if (Log.HasErrors)
                 return;
 
-            Backend.ShaderBackend.Initialize(this, BundleBuilder);
-
-            using (Log.StartProfiler(Queue))
-                Queue.BuildEverything();
-
+            using (Log.StartProfiler(UxlProcessor))
+                UxlProcessor.CompileDocuments();
             if (Log.HasErrors)
                 return;
 
@@ -210,6 +205,7 @@ public BackendResult Generate(Action<ICompiler> callback)
             UxlProcessor.CompileRequirements();
             ILStripper.Begin();
             Run(_transforms);
+            TypeBuilder.BuildTypes();
 
             using (Log.StartProfiler(ILStripper))
                 ILStripper.End();

src/compiler/core/IL/EntitySwapper.cs

@@ -65,6 +65,7 @@ DataType GetTypeInternal(DataType dt)
                                 args[i] = GetType(dt.FlattenedArguments[i]);
 
                             result = TypeBuilder.Parameterize(result.Source, def, args);
+                            TypeBuilder.BuildTypes();
                             SwapTypes.Add(dt, result);
                             return result;
                         }
@@ -98,6 +99,7 @@ DataType GetTypeInternal(DataType dt)
 
                 var def = result.IsGenericDefinition ? result : GetType(dt.GenericDefinition);
                 result = TypeBuilder.Parameterize(dt.Source, def, args);
+                TypeBuilder.BuildTypes();
             }
 
             SwapTypes.Add(dt, result);

src/compiler/core/Syntax/Builders/BlockBuilder.CompileDraw.cs

@@ -32,8 +32,10 @@ public Statement CompileDraw(Function func, List<VariableScope> vscopeStack, Ast
 
             var result = new DrawBlock(draw.Source, parent, method, FlattenVariableScopes(vscopeStack));
             method.DrawBlocks.Add(result);
-            _queue.EnqueueBlock(result, x => PopulateBlock(draw.Block, x));
-            _queue.EnqueueDrawClass(method.DeclaringType);
+
+            EnqueueBlock(result, x => PopulateBlock(draw.Block, x));
+            _enqueuedDrawClasses.Add(method.DeclaringType);
+
             return result.DrawScope;
         }
 

src/compiler/core/Syntax/Builders/BlockBuilder.CreateBlock.cs

@@ -30,7 +30,8 @@ public Block CreateBlock(AstBlock ast, Namescope parent)
                 Log.Error(src, ErrorCode.E3214, "Block declaration is not allowed in this scope");
 
             _processedBlocks.Add(ast, result);
-            _queue.EnqueueBlock(result, x => PopulateBlock(ast, x));
+            EnqueueBlock(result, x => PopulateBlock(ast, x));
+
             return result;
         }
 
@@ -75,7 +76,7 @@ MetaBlock CreateNodeBlock(AstNode ast, BlockBase parent)
                     return MetaBlock.Invalid;
             }
 
-            _queue.EnqueueBlock(result, x => PopulateBlock(ast, x));
+            EnqueueBlock(result, x => PopulateBlock(ast, x));
             return result;
         }
     }

src/compiler/core/Syntax/Builders/BlockBuilder.CreateMetaProperty.cs

@@ -58,11 +58,12 @@ MetaProperty CreateMetaProperty(AstMetaProperty ast, BlockBase parent)
             }
 
             var result = new MetaProperty(ast.Name.Source, parent, dt, ast.Name.Symbol, visibility);
-            _queue.EnqueueMetaProperty(ast, result);
+            _enqueuedProperties.Add(new KeyValuePair<AstMetaProperty, MetaProperty>(ast, result));
+
             return result;
         }
 
-        internal void CompileMetaPropertyDefinitions(AstMetaProperty ast, MetaProperty mp)
+        void CompileMetaPropertyDefinitions(AstMetaProperty ast, MetaProperty mp)
         {
             var defs = new MetaDefinition[ast.Definitions.Count];
 

src/compiler/core/Syntax/Builders/BlockBuilder.FlattenType.cs

@@ -8,7 +8,7 @@ public partial class BlockBuilder
     {
         internal readonly Dictionary<DataType, HashSet<DataType>> FlattenedTypes = new Dictionary<DataType, HashSet<DataType>>();
 
-        internal void FlattenTypes()
+        void FlattenTypes()
         {
             FlattenTypes(_il);
 

src/compiler/core/Syntax/Builders/BlockBuilder.cs

@@ -22,27 +22,54 @@ public partial class BlockBuilder : LogObject
         readonly ILFactory _ilf;
         readonly NameResolver _resolver;
         readonly Compiler _compiler;
-        readonly BuildQueue _queue;
         readonly Dictionary<AstBlockBase, Block> _processedBlocks = new Dictionary<AstBlockBase, Block>();
+        readonly List<BlockBase> _enqueuedBlocks = new List<BlockBase>();
+        readonly List<KeyValuePair<AstMetaProperty, MetaProperty>> _enqueuedProperties = new List<KeyValuePair<AstMetaProperty, MetaProperty>>();
+        readonly HashSet<DataType> _enqueuedDrawClasses = new HashSet<DataType>();
 
         Block _terminals;
         readonly HashSet<string> _terminalNames = new HashSet<string>();
 
-        internal BlockBuilder(
+        public BlockBuilder(
             Backend backend,
             Namespace il,
             ILFactory ilf,
             NameResolver resolver,
-            Compiler compiler,
-            BuildQueue queue)
+            Compiler compiler)
             : base(compiler)
         {
             _backend = backend;
             _il = il;
             _ilf = ilf;
             _resolver = resolver;
             _compiler = compiler;
-            _queue = queue;
+        }
+
+        void EnqueueBlock(BlockBase b, Action<BlockBase> populate)
+        {
+            b.Populating = populate;
+            _enqueuedBlocks.Add(b);
+        }
+
+        public void Build()
+        {
+            FlattenTypes();
+
+            for (int i = 0; i < _enqueuedBlocks.Count; i++)
+                if (!_enqueuedBlocks[i].Source.Bundle.CanLink)
+                    _enqueuedBlocks[i].Populate();
+
+            _enqueuedBlocks.Clear();
+
+            for (int i = 0; i < _enqueuedProperties.Count; i++)
+                CompileMetaPropertyDefinitions(_enqueuedProperties[i].Key, _enqueuedProperties[i].Value);
+
+            _enqueuedProperties.Clear();
+
+            foreach (var dt in _enqueuedDrawClasses)
+                DrawCallGenerator.GenerateDrawCalls(_compiler, dt);
+
+            _enqueuedDrawClasses.Clear();
         }
 
         public Block TerminalProperties
@@ -56,6 +83,7 @@ public Block TerminalProperties
 
                     foreach (var t in _backend.ShaderBackend.InputProperties)
                         CompileTerminalProperty(t);
+
                     foreach (var t in _backend.ShaderBackend.OutputProperties)
                         CompileTerminalProperty(t);
                 }