From 639b16543e2138590258767be5c5bd5d0170c743 Mon Sep 17 00:00:00 2001 From: AmberGraceSoftware Date: Fri, 11 Aug 2023 21:18:44 -0600 Subject: [PATCH] Use new fflag in getMetatable helper --- Analysis/src/Type.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Analysis/src/Type.cpp b/Analysis/src/Type.cpp index 89c0c428..cbc2975e 100644 --- a/Analysis/src/Type.cpp +++ b/Analysis/src/Type.cpp @@ -27,6 +27,7 @@ LUAU_FASTINT(LuauTypeInferRecursionLimit) LUAU_FASTFLAG(LuauInstantiateInSubtyping) LUAU_FASTFLAG(LuauNormalizeBlockedTypes) LUAU_FASTFLAG(DebugLuauReadWriteProperties) +LUAU_FASTFLAG(LuauIntersectedBinopOverloadFix) namespace Luau { @@ -263,15 +264,18 @@ std::optional getMetatable(TypeId type, NotNull builtinTyp { type = follow(type); - if (const IntersectionType* itv = get(type)) + if (FFlag::LuauIntersectedBinopOverloadFix) { - for (TypeId part : itv->parts) + if (const IntersectionType* itv = get(type)) { - auto partMT = getMetatable(part, builtinTypes); - if (partMT != std::nullopt) - return partMT; + for (TypeId part : itv->parts) + { + auto partMT = getMetatable(part, builtinTypes); + if (partMT != std::nullopt) + return partMT; + } + return std::nullopt; } - return std::nullopt; } if (const MetatableType* mtType = get(type))