Sync to upstream/release/606

Analysis/include/Luau/ConstraintGenerator.h

@@ -150,7 +150,7 @@ private:
      */
     ScopePtr childScope(AstNode* node, const ScopePtr& parent);
 
-    std::optional<TypeId> lookup(Scope* scope, DefId def);
+    std::optional<TypeId> lookup(Scope* scope, DefId def, bool prototype = true);
 
     /**
      * Adds a new constraint with no dependencies to a given scope.

Analysis/include/Luau/DataFlowGraph.h

@@ -74,8 +74,15 @@ private:
 
 struct DfgScope
 {
+    enum ScopeType
+    {
+        Linear,
+        Loop,
+        Function,
+    };
+
     DfgScope* parent;
-    bool isLoopScope;
+    ScopeType scopeType;
 
     using Bindings = DenseHashMap<Symbol, const Def*>;
     using Props = DenseHashMap<const Def*, std::unordered_map<std::string, const Def*>>;
@@ -117,7 +124,17 @@ private:
 
     std::vector<std::unique_ptr<DfgScope>> scopes;
 
-    DfgScope* childScope(DfgScope* scope, bool isLoopScope = false);
+    struct FunctionCapture
+    {
+        std::vector<DefId> captureDefs;
+        std::vector<DefId> allVersions;
+        size_t versionOffset = 0;
+    };
+
+    DenseHashMap<Symbol, FunctionCapture> captures{Symbol{}};
+    void resolveCaptures();
+
+    DfgScope* childScope(DfgScope* scope, DfgScope::ScopeType scopeType = DfgScope::Linear);
 
     void join(DfgScope* p, DfgScope* a, DfgScope* b);
     void joinBindings(DfgScope::Bindings& p, const DfgScope::Bindings& a, const DfgScope::Bindings& b);
@@ -167,11 +184,11 @@ private:
     DataFlowResult visitExpr(DfgScope* scope, AstExprError* error);
 
     void visitLValue(DfgScope* scope, AstExpr* e, DefId incomingDef, bool isCompoundAssignment = false);
-    void visitLValue(DfgScope* scope, AstExprLocal* l, DefId incomingDef, bool isCompoundAssignment);
-    void visitLValue(DfgScope* scope, AstExprGlobal* g, DefId incomingDef, bool isCompoundAssignment);
-    void visitLValue(DfgScope* scope, AstExprIndexName* i, DefId incomingDef);
-    void visitLValue(DfgScope* scope, AstExprIndexExpr* i, DefId incomingDef);
-    void visitLValue(DfgScope* scope, AstExprError* e, DefId incomingDef);
+    DefId visitLValue(DfgScope* scope, AstExprLocal* l, DefId incomingDef, bool isCompoundAssignment);
+    DefId visitLValue(DfgScope* scope, AstExprGlobal* g, DefId incomingDef, bool isCompoundAssignment);
+    DefId visitLValue(DfgScope* scope, AstExprIndexName* i, DefId incomingDef);
+    DefId visitLValue(DfgScope* scope, AstExprIndexExpr* i, DefId incomingDef);
+    DefId visitLValue(DfgScope* scope, AstExprError* e, DefId incomingDef);
 
     void visitType(DfgScope* scope, AstType* t);
     void visitType(DfgScope* scope, AstTypeReference* r);

Analysis/include/Luau/Def.h

@@ -73,6 +73,7 @@ const T* get(DefId def)
 }
 
 bool containsSubscriptedDefinition(DefId def);
+void collectOperands(DefId def, std::vector<DefId>* operands);
 
 struct DefArena
 {

Analysis/src/ConstraintGenerator.cpp

@@ -205,7 +205,7 @@ ScopePtr ConstraintGenerator::childScope(AstNode* node, const ScopePtr& parent)
     return scope;
 }
 
-std::optional<TypeId> ConstraintGenerator::lookup(Scope* scope, DefId def)
+std::optional<TypeId> ConstraintGenerator::lookup(Scope* scope, DefId def, bool prototype)
 {
     if (get<Cell>(def))
         return scope->lookup(def);
@@ -213,22 +213,24 @@ std::optional<TypeId> ConstraintGenerator::lookup(Scope* scope, DefId def)
     {
         if (auto found = scope->lookup(def))
             return *found;
+        else if (!prototype)
+            return std::nullopt;
 
         TypeId res = builtinTypes->neverType;
 
         for (DefId operand : phi->operands)
         {
-            // `scope->lookup(operand)` may return nothing because it could be a phi node of globals, but one of
-            // the operand of that global has never been assigned a type, and so it should be an error.
-            // e.g.
-            // ```
-            // if foo() then
-            //   g = 5
-            // end
-            // -- `g` here is a phi node of the assignment to `g`, or the original revision of `g` before the branch.
-            // ```
-            TypeId ty = scope->lookup(operand).value_or(builtinTypes->errorRecoveryType());
-            res = simplifyUnion(builtinTypes, arena, res, ty).result;
+            // `scope->lookup(operand)` may return nothing because we only bind a type to that operand
+            // once we've seen that particular `DefId`. In this case, we need to prototype those types
+            // and use those at a later time.
+            std::optional<TypeId> ty = lookup(scope, operand, /*prototype*/false);
+            if (!ty)
+            {
+                ty = arena->addType(BlockedType{});
+                rootScope->lvalueTypes[operand] = *ty;
+            }
+
+            res = simplifyUnion(builtinTypes, arena, res, *ty).result;
         }
 
         scope->lvalueTypes[def] = res;
@@ -861,7 +863,7 @@ ControlFlow ConstraintGenerator::visit(const ScopePtr& scope, AstStatFunction* f
     DenseHashSet<Constraint*> excludeList{nullptr};
 
     DefId def = dfg->getDef(function->name);
-    std::optional<TypeId> existingFunctionTy = scope->lookup(def);
+    std::optional<TypeId> existingFunctionTy = lookup(scope.get(), def);
 
     if (AstExprLocal* localName = function->name->as<AstExprLocal>())
     {
@@ -1724,16 +1726,14 @@ Inference ConstraintGenerator::check(const ScopePtr& scope, AstExprGlobal* globa
     /* prepopulateGlobalScope() has already added all global functions to the environment by this point, so any
      * global that is not already in-scope is definitely an unknown symbol.
      */
-    if (auto ty = lookup(scope.get(), def))
-        return Inference{*ty, refinementArena.proposition(key, builtinTypes->truthyType)};
-    else if (auto ty = scope->lookup(global->name))
+    if (auto ty = lookup(scope.get(), def, /*prototype=*/false))
     {
         rootScope->lvalueTypes[def] = *ty;
         return Inference{*ty, refinementArena.proposition(key, builtinTypes->truthyType)};
     }
     else
     {
-        reportError(global->location, UnknownSymbol{global->name.value});
+        reportError(global->location, UnknownSymbol{global->name.value, UnknownSymbol::Binding});
         return Inference{builtinTypes->errorRecoveryType()};
     }
 }
@@ -3110,6 +3110,16 @@ struct GlobalPrepopulator : AstVisitor
 
         return true;
     }
+
+    bool visit(AstType*) override
+    {
+        return true;
+    }
+
+    bool visit(class AstTypePack* node) override
+    {
+        return true;
+    }
 };
 
 void ConstraintGenerator::prepopulateGlobalScope(const ScopePtr& globalScope, AstStatBlock* program)

Analysis/src/DataFlowGraph.cpp

@@ -116,7 +116,7 @@ bool DfgScope::canUpdateDefinition(Symbol symbol) const
     {
         if (current->bindings.find(symbol))
             return true;
-        else if (current->isLoopScope)
+        else if (current->scopeType == DfgScope::Loop)
             return false;
     }
 
@@ -129,7 +129,7 @@ bool DfgScope::canUpdateDefinition(DefId def, const std::string& key) const
     {
         if (auto props = current->props.find(def))
             return true;
-        else if (current->isLoopScope)
+        else if (current->scopeType == DfgScope::Loop)
             return false;
     }
 
@@ -144,6 +144,7 @@ DataFlowGraph DataFlowGraphBuilder::build(AstStatBlock* block, NotNull<InternalE
     builder.handle = handle;
     builder.moduleScope = builder.childScope(nullptr); // nullptr is the root DFG scope.
     builder.visitBlockWithoutChildScope(builder.moduleScope, block);
+    builder.resolveCaptures();
 
     if (FFlag::DebugLuauFreezeArena)
     {
@@ -154,9 +155,27 @@ DataFlowGraph DataFlowGraphBuilder::build(AstStatBlock* block, NotNull<InternalE
     return std::move(builder.graph);
 }
 
-DfgScope* DataFlowGraphBuilder::childScope(DfgScope* scope, bool isLoopScope)
+void DataFlowGraphBuilder::resolveCaptures()
 {
-    return scopes.emplace_back(new DfgScope{scope, isLoopScope}).get();
+    for (const auto& [_, capture] : captures)
+    {
+        std::vector<DefId> operands;
+        for (size_t i = capture.versionOffset; i < capture.allVersions.size(); ++i)
+            collectOperands(capture.allVersions[i], &operands);
+
+        for (DefId captureDef : capture.captureDefs)
+        {
+            Phi* phi = const_cast<Phi*>(get<Phi>(captureDef));
+            LUAU_ASSERT(phi);
+            LUAU_ASSERT(phi->operands.empty());
+            phi->operands = operands;
+        }
+    }
+}
+
+DfgScope* DataFlowGraphBuilder::childScope(DfgScope* scope, DfgScope::ScopeType scopeType)
+{
+    return scopes.emplace_back(new DfgScope{scope, scopeType}).get();
 }
 
 void DataFlowGraphBuilder::join(DfgScope* p, DfgScope* a, DfgScope* b)
@@ -227,24 +246,44 @@ void DataFlowGraphBuilder::joinProps(DfgScope::Props& p, const DfgScope::Props&
 
 DefId DataFlowGraphBuilder::lookup(DfgScope* scope, Symbol symbol)
 {
-    if (auto found = scope->lookup(symbol))
-        return *found;
-    else
+    for (DfgScope* current = scope; current; current = current->parent)
     {
-        DefId result = defArena->freshCell();
-        if (symbol.local)
-            scope->bindings[symbol] = result;
-        else
-            moduleScope->bindings[symbol] = result;
-        return result;
+        if (auto found = current->bindings.find(symbol))
+            return NotNull{*found};
+        else if (current->scopeType == DfgScope::Function)
+        {
+            FunctionCapture& capture = captures[symbol];
+            DefId captureDef = defArena->phi({});
+            capture.captureDefs.push_back(captureDef);
+            scope->bindings[symbol] = captureDef;
+            return NotNull{captureDef};
         }
+    }
+
+    DefId result = defArena->freshCell();
+    scope->bindings[symbol] = result;
+    captures[symbol].allVersions.push_back(result);
+    return result;
 }
 
 DefId DataFlowGraphBuilder::lookup(DfgScope* scope, DefId def, const std::string& key)
 {
-    if (auto found = scope->lookup(def, key))
-        return *found;
-    else if (auto phi = get<Phi>(def))
+    for (DfgScope* current = scope; current; current = current->parent)
+    {
+        if (auto props = current->props.find(def))
+        {
+            if (auto it = props->find(key); it != props->end())
+                return NotNull{it->second};
+        }
+        else if (auto phi = get<Phi>(def); phi && phi->operands.empty()) // Unresolved phi nodes
+        {
+            DefId result = defArena->freshCell();
+            scope->props[def][key] = result;
+            return result;
+        }
+    }
+
+    if (auto phi = get<Phi>(def))
     {
         std::vector<DefId> defs;
         for (DefId operand : phi->operands)
@@ -361,7 +400,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatIf* i)
 ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatWhile* w)
 {
     // TODO(controlflow): entry point has a back edge from exit point
-    DfgScope* whileScope = childScope(scope, /*isLoopScope=*/true);
+    DfgScope* whileScope = childScope(scope, DfgScope::Loop);
     visitExpr(whileScope, w->condition);
     visit(whileScope, w->body);
 
@@ -373,7 +412,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatWhile* w)
 ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatRepeat* r)
 {
     // TODO(controlflow): entry point has a back edge from exit point
-    DfgScope* repeatScope = childScope(scope, /*isLoopScope=*/true);
+    DfgScope* repeatScope = childScope(scope, DfgScope::Loop);
     visitBlockWithoutChildScope(repeatScope, r->body);
     visitExpr(repeatScope, r->condition);
 
@@ -429,6 +468,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatLocal* l)
         DefId def = defArena->freshCell(subscripted);
         graph.localDefs[local] = def;
         scope->bindings[local] = def;
+        captures[local].allVersions.push_back(def);
     }
 
     return ControlFlow::None;
@@ -436,7 +476,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatLocal* l)
 
 ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatFor* f)
 {
-    DfgScope* forScope = childScope(scope, /*isLoopScope=*/true);
+    DfgScope* forScope = childScope(scope, DfgScope::Loop);
 
     visitExpr(scope, f->from);
     visitExpr(scope, f->to);
@@ -449,6 +489,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatFor* f)
     DefId def = defArena->freshCell();
     graph.localDefs[f->var] = def;
     scope->bindings[f->var] = def;
+    captures[f->var].allVersions.push_back(def);
 
     // TODO(controlflow): entry point has a back edge from exit point
     visit(forScope, f->body);
@@ -460,7 +501,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatFor* f)
 
 ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatForIn* f)
 {
-    DfgScope* forScope = childScope(scope, /*isLoopScope=*/true);
+    DfgScope* forScope = childScope(scope, DfgScope::Loop);
 
     for (AstLocal* local : f->vars)
     {
@@ -470,6 +511,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatForIn* f)
         DefId def = defArena->freshCell();
         graph.localDefs[local] = def;
         forScope->bindings[local] = def;
+        captures[local].allVersions.push_back(def);
     }
 
     // TODO(controlflow): entry point has a back edge from exit point
@@ -527,10 +569,21 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatFunction* f)
     //
     // which is evidence that references to variables must be a phi node of all possible definitions,
     // but for bug compatibility, we'll assume the same thing here.
-    DefId prototype = defArena->freshCell();
-    visitLValue(scope, f->name, prototype);
+    visitLValue(scope, f->name, defArena->freshCell());
     visitExpr(scope, f->func);
 
+    if (auto local = f->name->as<AstExprLocal>())
+    {
+        // local f
+        // function f()
+        //   if cond() then
+        //     f() -- should reference only the function version and other future version, and nothing prior
+        //   end
+        // end
+        FunctionCapture& capture = captures[local->local];
+        capture.versionOffset = capture.allVersions.size() - 1;
+    }
+
     return ControlFlow::None;
 }
 
@@ -539,6 +592,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatLocalFunction* l
     DefId def = defArena->freshCell();
     graph.localDefs[l->name] = def;
     scope->bindings[l->name] = def;
+    captures[l->name].allVersions.push_back(def);
     visitExpr(scope, l->func);
 
     return ControlFlow::None;
@@ -559,6 +613,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatDeclareGlobal* d
     DefId def = defArena->freshCell();
     graph.declaredDefs[d] = def;
     scope->bindings[d->name] = def;
+    captures[d->name].allVersions.push_back(def);
 
     visitType(scope, d->type);
 
@@ -570,6 +625,7 @@ ControlFlow DataFlowGraphBuilder::visit(DfgScope* scope, AstStatDeclareFunction*
     DefId def = defArena->freshCell();
     graph.declaredDefs[d] = def;
     scope->bindings[d->name] = def;
+    captures[d->name].allVersions.push_back(def);
 
     DfgScope* unreachable = childScope(scope);
     visitGenerics(unreachable, d->generics);
@@ -669,14 +725,9 @@ DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprGroup* gr
 
 DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprLocal* l)
 {
-    // DfgScope::lookup is intentional here: we want to be able to ice.
-    if (auto def = scope->lookup(l->local))
-    {
-        const RefinementKey* key = keyArena->leaf(*def);
-        return {*def, key};
-    }
-
-    handle->ice("DFG: AstExprLocal came before its declaration?");
+    DefId def = lookup(scope, l->local);
+    const RefinementKey* key = keyArena->leaf(def);
+    return {def, key};
 }
 
 DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprGlobal* g)
@@ -723,7 +774,7 @@ DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprIndexExpr
 
 DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprFunction* f)
 {
-    DfgScope* signatureScope = childScope(scope);
+    DfgScope* signatureScope = childScope(scope, DfgScope::Function);
 
     if (AstLocal* self = f->self)
     {
@@ -733,6 +784,7 @@ DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprFunction*
         DefId def = defArena->freshCell();
         graph.localDefs[self] = def;
         signatureScope->bindings[self] = def;
+        captures[self].allVersions.push_back(def);
     }
 
     for (AstLocal* param : f->args)
@@ -743,6 +795,7 @@ DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprFunction*
         DefId def = defArena->freshCell();
         graph.localDefs[param] = def;
         signatureScope->bindings[param] = def;
+        captures[param].allVersions.push_back(def);
     }
 
     if (f->varargAnnotation)
@@ -827,6 +880,7 @@ DataFlowResult DataFlowGraphBuilder::visitExpr(DfgScope* scope, AstExprError* er
 
 void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExpr* e, DefId incomingDef, bool isCompoundAssignment)
 {
+    auto go = [&]() {
         if (auto l = e->as<AstExprLocal>())
             return visitLValue(scope, l, incomingDef, isCompoundAssignment);
         else if (auto g = e->as<AstExprGlobal>())
@@ -839,29 +893,33 @@ void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExpr* e, DefId incomi
             return visitLValue(scope, error, incomingDef);
         else
             handle->ice("Unknown AstExpr in DataFlowGraphBuilder::visitLValue");
+    };
+
+    graph.astDefs[e] = go();
 }
 
-void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprLocal* l, DefId incomingDef, bool isCompoundAssignment)
+DefId DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprLocal* l, DefId incomingDef, bool isCompoundAssignment)
 {
     // We need to keep the previous def around for a compound assignment.
     if (isCompoundAssignment)
     {
-        if (auto def = scope->lookup(l->local))
-            graph.compoundAssignDefs[l] = *def;
+        DefId def = lookup(scope, l->local);
+        graph.compoundAssignDefs[l] = def;
     }
 
     // In order to avoid alias tracking, we need to clip the reference to the parent def.
     if (scope->canUpdateDefinition(l->local))
     {
         DefId updated = defArena->freshCell(containsSubscriptedDefinition(incomingDef));
-        graph.astDefs[l] = updated;
         scope->bindings[l->local] = updated;
+        captures[l->local].allVersions.push_back(updated);
+        return updated;
     }
     else
-        visitExpr(scope, static_cast<AstExpr*>(l));
+        return visitExpr(scope, static_cast<AstExpr*>(l)).def;
 }
 
-void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprGlobal* g, DefId incomingDef, bool isCompoundAssignment)
+DefId DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprGlobal* g, DefId incomingDef, bool isCompoundAssignment)
 {
     // We need to keep the previous def around for a compound assignment.
     if (isCompoundAssignment)
@@ -874,28 +932,29 @@ void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprGlobal* g, DefId
     if (scope->canUpdateDefinition(g->name))
     {
         DefId updated = defArena->freshCell(containsSubscriptedDefinition(incomingDef));
-        graph.astDefs[g] = updated;
         scope->bindings[g->name] = updated;
+        captures[g->name].allVersions.push_back(updated);
+        return updated;
     }
     else
-        visitExpr(scope, static_cast<AstExpr*>(g));
+        return visitExpr(scope, static_cast<AstExpr*>(g)).def;
 }
 
-void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprIndexName* i, DefId incomingDef)
+DefId DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprIndexName* i, DefId incomingDef)
 {
     DefId parentDef = visitExpr(scope, i->expr).def;
 
     if (scope->canUpdateDefinition(parentDef, i->index.value))
     {
         DefId updated = defArena->freshCell(containsSubscriptedDefinition(incomingDef));
-        graph.astDefs[i] = updated;
         scope->props[parentDef][i->index.value] = updated;
+        return updated;
     }
     else
-        visitExpr(scope, static_cast<AstExpr*>(i));
+        return visitExpr(scope, static_cast<AstExpr*>(i)).def;
 }
 
-void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprIndexExpr* i, DefId incomingDef)
+DefId DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprIndexExpr* i, DefId incomingDef)
 {
     DefId parentDef = visitExpr(scope, i->expr).def;
     visitExpr(scope, i->index);
@@ -905,20 +964,19 @@ void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprIndexExpr* i, Def
         if (scope->canUpdateDefinition(parentDef, string->value.data))
         {
             DefId updated = defArena->freshCell(containsSubscriptedDefinition(incomingDef));
-            graph.astDefs[i] = updated;
             scope->props[parentDef][string->value.data] = updated;
+            return updated;
         }
         else
-            visitExpr(scope, static_cast<AstExpr*>(i));
+            return visitExpr(scope, static_cast<AstExpr*>(i)).def;
     }
-
-    graph.astDefs[i] = defArena->freshCell();
+    else
+        return defArena->freshCell(/*subscripted=*/true);
 }
 
-void DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprError* error, DefId incomingDef)
+DefId DataFlowGraphBuilder::visitLValue(DfgScope* scope, AstExprError* error, DefId incomingDef)
 {
-    DefId def = visitExpr(scope, error).def;
-    graph.astDefs[error] = def;
+    return visitExpr(scope, error).def;
 }
 
 void DataFlowGraphBuilder::visitType(DfgScope* scope, AstType* t)

Analysis/src/Def.cpp

@@ -19,17 +19,13 @@ bool containsSubscriptedDefinition(DefId def)
         return false;
 }
 
-DefId DefArena::freshCell(bool subscripted)
+void collectOperands(DefId def, std::vector<DefId>* operands)
 {
-    return NotNull{allocator.allocate(Def{Cell{subscripted}})};
-}
-
-static void collectOperands(DefId def, std::vector<DefId>& operands)
-{
-    if (std::find(operands.begin(), operands.end(), def) != operands.end())
+    LUAU_ASSERT(operands);
+    if (std::find(operands->begin(), operands->end(), def) != operands->end())
         return;
     else if (get<Cell>(def))
-        operands.push_back(def);
+        operands->push_back(def);
     else if (auto phi = get<Phi>(def))
     {
         for (const Def* operand : phi->operands)
@@ -37,6 +33,11 @@ static void collectOperands(DefId def, std::vector<DefId>& operands)
     }
 }
 
+DefId DefArena::freshCell(bool subscripted)
+{
+    return NotNull{allocator.allocate(Def{Cell{subscripted}})};
+}
+
 DefId DefArena::phi(DefId a, DefId b)
 {
     return phi({a, b});
@@ -46,7 +47,7 @@ DefId DefArena::phi(const std::vector<DefId>& defs)
 {
     std::vector<DefId> operands;
     for (DefId operand : defs)
-        collectOperands(operand, operands);
+        collectOperands(operand, &operands);
 
     // There's no need to allocate a Phi node for a singleton set.
     if (operands.size() == 1)

Analysis/src/Frontend.cpp

@@ -32,11 +32,9 @@ LUAU_FASTINT(LuauTypeInferRecursionLimit)
 LUAU_FASTINT(LuauTarjanChildLimit)
 LUAU_FASTFLAG(LuauInferInNoCheckMode)
 LUAU_FASTFLAGVARIABLE(LuauKnowsTheDataModel3, false)
-LUAU_FASTINTVARIABLE(LuauAutocompleteCheckTimeoutMs, 100) // TODO: Remove with FFlagLuauTypecheckLimitControls
 LUAU_FASTFLAGVARIABLE(DebugLuauDeferredConstraintResolution, false)
 LUAU_FASTFLAGVARIABLE(DebugLuauLogSolverToJson, false)
 LUAU_FASTFLAGVARIABLE(DebugLuauReadWriteProperties, false)
-LUAU_FASTFLAGVARIABLE(LuauTypecheckLimitControls, false)
 LUAU_FASTFLAGVARIABLE(CorrectEarlyReturnInMarkDirty, false)
 LUAU_FASTFLAGVARIABLE(LuauDefinitionFileSetModuleName, false)
 
@@ -902,8 +900,6 @@ void Frontend::checkBuildQueueItem(BuildQueueItem& item)
 
     TypeCheckLimits typeCheckLimits;
 
-    if (FFlag::LuauTypecheckLimitControls)
-    {
     if (item.options.moduleTimeLimitSec)
         typeCheckLimits.finishTime = TimeTrace::getClock() + *item.options.moduleTimeLimitSec;
     else
@@ -926,58 +922,19 @@ void Frontend::checkBuildQueueItem(BuildQueueItem& item)
     }
 
     typeCheckLimits.cancellationToken = item.options.cancellationToken;
-    }
 
     if (item.options.forAutocomplete)
     {
-        double autocompleteTimeLimit = FInt::LuauAutocompleteCheckTimeoutMs / 1000.0;
-
-        if (!FFlag::LuauTypecheckLimitControls)
-        {
-            // The autocomplete typecheck is always in strict mode with DM awareness
-            // to provide better type information for IDE features
-
-            if (autocompleteTimeLimit != 0.0)
-                typeCheckLimits.finishTime = TimeTrace::getClock() + autocompleteTimeLimit;
-            else
-                typeCheckLimits.finishTime = std::nullopt;
-
-            // TODO: This is a dirty ad hoc solution for autocomplete timeouts
-            // We are trying to dynamically adjust our existing limits to lower total typechecking time under the limit
-            // so that we'll have type information for the whole file at lower quality instead of a full abort in the middle
-            if (FInt::LuauTarjanChildLimit > 0)
-                typeCheckLimits.instantiationChildLimit = std::max(1, int(FInt::LuauTarjanChildLimit * sourceNode.autocompleteLimitsMult));
-            else
-                typeCheckLimits.instantiationChildLimit = std::nullopt;
-
-            if (FInt::LuauTypeInferIterationLimit > 0)
-                typeCheckLimits.unifierIterationLimit = std::max(1, int(FInt::LuauTypeInferIterationLimit * sourceNode.autocompleteLimitsMult));
-            else
-                typeCheckLimits.unifierIterationLimit = std::nullopt;
-
-            typeCheckLimits.cancellationToken = item.options.cancellationToken;
-        }
-
         // The autocomplete typecheck is always in strict mode with DM awareness to provide better type information for IDE features
         ModulePtr moduleForAutocomplete = check(sourceModule, Mode::Strict, requireCycles, environmentScope, /*forAutocomplete*/ true,
             /*recordJsonLog*/ false, typeCheckLimits);
 
         double duration = getTimestamp() - timestamp;
 
-        if (FFlag::LuauTypecheckLimitControls)
-        {
         moduleForAutocomplete->checkDurationSec = duration;
 
         if (item.options.moduleTimeLimitSec && item.options.applyInternalLimitScaling)
             applyInternalLimitScaling(sourceNode, moduleForAutocomplete, *item.options.moduleTimeLimitSec);
-        }
-        else
-        {
-            if (moduleForAutocomplete->timeout)
-                sourceNode.autocompleteLimitsMult = sourceNode.autocompleteLimitsMult / 2.0;
-            else if (duration < autocompleteTimeLimit / 2.0)
-                sourceNode.autocompleteLimitsMult = std::min(sourceNode.autocompleteLimitsMult * 2.0, 1.0);
-        }
 
         item.stats.timeCheck += duration;
         item.stats.filesStrict += 1;
@@ -986,15 +943,8 @@ void Frontend::checkBuildQueueItem(BuildQueueItem& item)
         return;
     }
 
-    if (!FFlag::LuauTypecheckLimitControls)
-    {
-        typeCheckLimits.cancellationToken = item.options.cancellationToken;
-    }
-
     ModulePtr module = check(sourceModule, mode, requireCycles, environmentScope, /*forAutocomplete*/ false, item.recordJsonLog, typeCheckLimits);
 
-    if (FFlag::LuauTypecheckLimitControls)
-    {
     double duration = getTimestamp() - timestamp;
 
     module->checkDurationSec = duration;
@@ -1003,12 +953,6 @@ void Frontend::checkBuildQueueItem(BuildQueueItem& item)
         applyInternalLimitScaling(sourceNode, module, *item.options.moduleTimeLimitSec);
 
     item.stats.timeCheck += duration;
-    }
-    else
-    {
-        item.stats.timeCheck += getTimestamp() - timestamp;
-    }
-
     item.stats.filesStrict += mode == Mode::Strict;
     item.stats.filesNonstrict += mode == Mode::Nonstrict;
 

CLI/Bytecode.cpp

@@ -124,7 +124,7 @@ static bool analyzeFile(const char* name, const unsigned nestingLimit, std::vect
     {
         Luau::BytecodeBuilder bcb;
 
-        compileOrThrow(bcb, source.value(), copts());
+        compileOrThrow(bcb, *source, copts());
 
         const std::string& bytecode = bcb.getBytecode();
 

CodeGen/src/CodeGen.cpp

@@ -42,8 +42,18 @@
 LUAU_FASTFLAGVARIABLE(DebugCodegenNoOpt, false)
 LUAU_FASTFLAGVARIABLE(DebugCodegenOptSize, false)
 LUAU_FASTFLAGVARIABLE(DebugCodegenSkipNumbering, false)
+
+// Per-module IR instruction count limit
 LUAU_FASTINTVARIABLE(CodegenHeuristicsInstructionLimit, 1'048'576)   // 1 M
-LUAU_FASTINTVARIABLE(CodegenHeuristicsBlockLimit, 65'536)            // 64 K
+
+// Per-function IR block limit
+// Current value is based on some member variables being limited to 16 bits
+// Because block check is made before optimization passes and optimization can generate new blocks, limit is lowered 2x
+// The limit will probably be adjusted in the future to avoid performance issues with analysis that's more complex than O(n)
+LUAU_FASTINTVARIABLE(CodegenHeuristicsBlockLimit, 32'768)            // 32 K
+
+// Per-function IR instruction limit
+// Current value is based on some member variables being limited to 16 bits
 LUAU_FASTINTVARIABLE(CodegenHeuristicsBlockInstructionLimit, 65'536) // 64 K
 
 namespace Luau
@@ -104,11 +114,18 @@ static void logPerfFunction(Proto* p, uintptr_t addr, unsigned size)
 }
 
 template<typename AssemblyBuilder>
-static std::optional<NativeProto> createNativeFunction(AssemblyBuilder& build, ModuleHelpers& helpers, Proto* proto)
+static std::optional<NativeProto> createNativeFunction(AssemblyBuilder& build, ModuleHelpers& helpers, Proto* proto, uint32_t& totalIrInstCount)
 {
     IrBuilder ir;
     ir.buildFunctionIr(proto);
 
+    unsigned instCount = unsigned(ir.function.instructions.size());
+
+    if (totalIrInstCount + instCount >= unsigned(FInt::CodegenHeuristicsInstructionLimit.value))
+        return std::nullopt;
+
+    totalIrInstCount += instCount;
+
     if (!lowerFunction(ir, build, helpers, proto, {}, /* stats */ nullptr))
         return std::nullopt;
 
@@ -291,9 +308,13 @@ CodeGenCompilationResult compile(lua_State* L, int idx, unsigned int flags, Comp
     std::vector<NativeProto> results;
     results.reserve(protos.size());
 
+    uint32_t totalIrInstCount = 0;
+
     for (Proto* p : protos)
-        if (std::optional<NativeProto> np = createNativeFunction(build, helpers, p))
+    {
+        if (std::optional<NativeProto> np = createNativeFunction(build, helpers, p, totalIrInstCount))
             results.push_back(*np);
+    }
 
     // Very large modules might result in overflowing a jump offset; in this case we currently abandon the entire module
     if (!build.finalize())

CodeGen/src/CodeGenLower.h

@@ -253,11 +253,6 @@ inline bool lowerIr(A64::AssemblyBuilderA64& build, IrBuilder& ir, const std::ve
 template<typename AssemblyBuilder>
 inline bool lowerFunction(IrBuilder& ir, AssemblyBuilder& build, ModuleHelpers& helpers, Proto* proto, AssemblyOptions options, LoweringStats* stats)
 {
-    helpers.bytecodeInstructionCount += unsigned(ir.function.instructions.size());
-
-    if (helpers.bytecodeInstructionCount >= unsigned(FInt::CodegenHeuristicsInstructionLimit.value))
-        return false;
-
     killUnusedBlocks(ir.function);
 
     unsigned preOptBlockCount = 0;
@@ -268,9 +263,7 @@ inline bool lowerFunction(IrBuilder& ir, AssemblyBuilder& build, ModuleHelpers&
         preOptBlockCount += (block.kind != IrBlockKind::Dead);
         unsigned blockInstructions = block.finish - block.start;
         maxBlockInstructions = std::max(maxBlockInstructions, blockInstructions);
-    };
-
-    helpers.preOptBlockCount += preOptBlockCount;
+    }
 
     // we update stats before checking the heuristic so that even if we bail out
     // our stats include information about the limit that was exceeded.
@@ -280,9 +273,7 @@ inline bool lowerFunction(IrBuilder& ir, AssemblyBuilder& build, ModuleHelpers&
         stats->maxBlockInstructions = maxBlockInstructions;
     }
 
-    // we use helpers.blocksPreOpt instead of stats.blocksPreOpt since
-    // stats can be null across some code paths.
-    if (helpers.preOptBlockCount >= unsigned(FInt::CodegenHeuristicsBlockLimit.value))
+    if (preOptBlockCount >= unsigned(FInt::CodegenHeuristicsBlockLimit.value))
         return false;
 
     if (maxBlockInstructions >= unsigned(FInt::CodegenHeuristicsBlockInstructionLimit.value))

CodeGen/src/EmitCommon.h

@@ -31,9 +31,6 @@ struct ModuleHelpers
 
     // A64
     Label continueCall; // x0: closure
-
-    unsigned bytecodeInstructionCount = 0;
-    unsigned preOptBlockCount = 0;
 };
 
 } // namespace CodeGen

bench/bench_support.lua

@@ -66,7 +66,8 @@ end
 -- and 'false' otherwise.
 --
 -- Example usage:
---   local bench = script and require(script.Parent.bench_support) or require("bench_support")
+--   local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+--   local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 --   function testFunc()
 --      ...
 --   end

bench/gc/test_BinaryTree.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_GC_Boehm_Trees.lua

@@ -1,5 +1,6 @@
 --!nonstrict
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 local stretchTreeDepth = 18 -- about 16Mb
 local longLivedTreeDepth = 16 -- about 4Mb

bench/gc/test_GC_Tree_Pruning_Eager.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_Tree_Pruning_Gen.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_Tree_Pruning_Lazy.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_hashtable_Keyval.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local t = {}

bench/gc/test_LB_mandel.lua

@@ -21,7 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_LargeTableCtor_array.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_LargeTableCtor_hash.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_Pcall_pcall_yield.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_SunSpider_3d-raytrace.lua

@@ -22,7 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_nil.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_number.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_zerofill.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_select.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_table_pack.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_varargs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_abs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_and_or.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_math_abs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Assert.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Factorial.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_pcall_a_bar.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_pcall_game_Foo.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_xpcall_a_bar.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_xpcall_game_Foo.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableCtor_array.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableCtor_hash.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_index.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_ipairs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_iter.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_pairs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_MethodCalls.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_constructor.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_method_call.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_virtual_constructor.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_call_return.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_pcall_return.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_pcall_yield.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_xpcall_return.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_exponent.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_math_sqrt.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt_getfenv.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt_roundabout.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_StringInterp.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 bench.runCode(function()
     for j=1,1e6 do

bench/micro_tests/test_TableCreate_nil.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableCreate_number.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableCreate_zerofill.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableFind_loop_ipairs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableFind_table_find.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_index_cached.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_index_len.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_table_insert.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_table_insert_index.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableIteration.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_select.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_pack.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_unpack_array.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_unpack_range.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_varargs.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMove_empty_table.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(250001, 0)

bench/micro_tests/test_TableMove_same_table.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(5000001, 0)

bench/micro_tests/test_TableMove_table_create.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(250001, 0)

bench/micro_tests/test_TableRemoval_table_remove.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableSort.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 local arr_months = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}
 

bench/micro_tests/test_ToNumberString.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 bench.runCode(function()
     for j=1,1e6 do

bench/micro_tests/test_UpvalueCapture.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_VariadicSelect.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_string_lib.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 bench.runCode(function()
 	local src = string.rep("abcdefghijklmnopqrstuvwxyz", 100)

bench/micro_tests/test_table_concat.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 bench.runCode(function()
 	for outer=1,28,3 do

bench/tests/base64.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/tests/chess.lua

@@ -1,5 +1,6 @@
 
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 local RANKS = "12345678"
 local FILES = "abcdefgh"

bench/tests/life.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/tests/matrixmult.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 local function mmul(matrix1, matrix2)
     local shapeRows = #matrix1

bench/tests/mesh-normal-scalar.lua

@@ -1,5 +1,6 @@
 --!strict
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/tests/pcmmix.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 local samples = 100_000
 

bench/tests/qsort.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/tests/sha256.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../bench_support")
 
 function test()
 

bench/tests/shootout/ack.lua

@@ -23,7 +23,8 @@ SOFTWARE.
 ]]
 -- http://www.bagley.org/~doug/shootout/
 
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/binary-trees.lua

@@ -25,7 +25,8 @@ SOFTWARE.
 -- http://benchmarksgame.alioth.debian.org/
 -- contributed by Mike Pall
 
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/fannkuch-redux.lua

@@ -25,7 +25,8 @@ SOFTWARE.
 -- http://benchmarksgame.alioth.debian.org/
 -- contributed by Mike Pall
 
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/fixpoint-fact.lua

@@ -21,7 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/heapsort.lua

@@ -21,7 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/mandel.lua

@@ -21,7 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/n-body.lua

@@ -1,4 +1,5 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/qt.lua

@@ -23,7 +23,8 @@ SOFTWARE.
 ]]
 -- Julia sets via interval cell-mapping (quadtree version)
 
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()
 

bench/tests/shootout/queen.lua

@@ -21,7 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local function prequire(name) local success, result = pcall(require, name); return if success then result else nil end
+local bench = script and require(script.Parent.bench_support) or prequire("bench_support") or require("../../bench_support")
 
 function test()