Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync to upstream/release/655 #1563

Merged
merged 225 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
225 commits
Select commit Hold shift + click to select a range
a0b9950
Sync to upstream/release/602
aatxe Nov 3, 2023
efe133a
Merge branch 'upstream' into merge
aatxe Nov 3, 2023
4b68791
Sync to upstream/release/603
alexmccord Nov 10, 2023
6343648
Merge branch 'master' into merge
alexmccord Nov 10, 2023
e57cbf6
Merge branch 'heads/upstream' into merge
alexmccord Nov 10, 2023
674c6c4
Sync to upstream/release/604
andyfriesen Nov 17, 2023
4320153
Merge branch 'master' into merge
andyfriesen Nov 17, 2023
2d4a544
Merge branch 'upstream' into merge
andyfriesen Nov 17, 2023
557e77a
VM
Vighnesh-V Dec 2, 2023
98d2db7
add stdint import
Vighnesh-V Dec 2, 2023
e70eec0
Merge branch 'upstream' into merge
Vighnesh-V Dec 2, 2023
7985414
resolve one last merge conflict
Vighnesh-V Dec 2, 2023
c592f50
can CI handle this?
Vighnesh-V Dec 2, 2023
41669c9
Sync to upstream/release/605
Vighnesh-V Dec 2, 2023
c932b8e
remove tests for require by string
Vighnesh-V Dec 2, 2023
c48ffc3
endif
Vighnesh-V Dec 2, 2023
69728e8
Sync to upstream/release/606
vegorov-rbx Dec 8, 2023
f5441d7
Merge branch 'master' into merge
vegorov-rbx Dec 8, 2023
6068432
Merge branch 'upstream' into merge
vegorov-rbx Dec 8, 2023
139b169
Merge fix
vegorov-rbx Dec 8, 2023
f9c5cdd
Sync to upstream/release/607
aatxe Dec 15, 2023
89090a1
Merge branch 'master' into merge
aatxe Dec 15, 2023
d622618
Merge branch 'upstream' into merge
aatxe Dec 15, 2023
adea0f8
fix ubuntu build with import for cstddef in DenseHash
aatxe Dec 15, 2023
d4883bf
Merge branch 'upstream' of https://github.com/luau-lang/luau into ups…
Vighnesh-V Jan 11, 2024
0d5c842
Sync to upstream/release/608
Vighnesh-V Jan 12, 2024
74b0d00
Merge branch 'master' into merge
Vighnesh-V Jan 12, 2024
7932835
Merge branch 'upstream' into merge
Vighnesh-V Jan 12, 2024
50b4779
Sync to upstream/release/608
Vighnesh-V Jan 12, 2024
2f7509d
Merge branch 'upstream' into merge
Vighnesh-V Jan 12, 2024
38aa074
resolve memory leak in VecDeque
Vighnesh-V Jan 12, 2024
064d845
Sync to upstream/release/609
vegorov-rbx Jan 19, 2024
59a29fd
Merge branch 'master' into merge
vegorov-rbx Jan 19, 2024
2fd3da3
Merge branch 'upstream' into merge
vegorov-rbx Jan 19, 2024
0edacdd
Sync to upstream/release/610
aatxe Jan 27, 2024
e3aba92
Merge branch 'master' into merge
aatxe Jan 27, 2024
ce2665d
Merge branch 'upstream' into merge
aatxe Jan 27, 2024
dfa512b
Sync to upstream/release/611
alexmccord Feb 2, 2024
f8f0dd9
Merge branch 'master' into merge
alexmccord Feb 2, 2024
88d2b93
Merge branch 'heads/upstream' into merge
alexmccord Feb 2, 2024
5559c7f
Fix the stack-use-after-scope.
alexmccord Feb 2, 2024
1a6da94
Sync to upstream/release/612
andyfriesen Feb 9, 2024
45e72ee
Merge branch 'master' into merge
andyfriesen Feb 9, 2024
ffd9f32
Merge branch 'upstream' into merge
andyfriesen Feb 9, 2024
158d60c
Sync to upstream/release/613
vegorov-rbx Feb 16, 2024
1778950
Merge branch 'master' into merge
vegorov-rbx Feb 16, 2024
b5f2813
Merge branch 'upstream' into merge
vegorov-rbx Feb 16, 2024
22686ef
Sync to upstream/release/614
Vighnesh-V Feb 23, 2024
ccb5385
Merge branch 'master' into merge
Vighnesh-V Feb 23, 2024
0ab33af
Merge branch 'upstream' into merge
Vighnesh-V Feb 23, 2024
d4a2665
Sync to upstream/release/615
vegorov-rbx Mar 1, 2024
532fd10
Merge branch 'master' into merge
vegorov-rbx Mar 1, 2024
f36cae2
Merge branch 'upstream' into merge
vegorov-rbx Mar 1, 2024
ed4ce84
Merge fixes
vegorov-rbx Mar 1, 2024
27a05c0
Sync to upstream/release/616
aatxe Mar 8, 2024
9e1a26c
Merge branch 'master' into merge
aatxe Mar 8, 2024
1ebdfe0
Merge branch 'upstream' into merge
aatxe Mar 9, 2024
f27d4f5
Sync to upstream/release/617
alexmccord Mar 15, 2024
5e9a567
Merge branch 'master' into merge
alexmccord Mar 15, 2024
c1bbf1e
Merge branch 'heads/upstream' into merge
alexmccord Mar 15, 2024
6fff08b
Sync to upstream/release/618
andyfriesen Mar 22, 2024
a30b2ae
Merge branch 'master' into merge
andyfriesen Mar 22, 2024
4931165
Merge branch 'upstream' into merge
andyfriesen Mar 22, 2024
d8f49d6
Compiler fixes for MSVC and GCC.
andyfriesen Mar 22, 2024
fb90dc0
Sync with upstream/release/620
AmaranthineCodices Mar 30, 2024
77598ed
Merge branch 'master' into merge
AmaranthineCodices Mar 30, 2024
3e1b413
Merge branch 'upstream' into merge
AmaranthineCodices Mar 30, 2024
c730a51
Sync to upstream/release/620
Vighnesh-V Apr 5, 2024
6bef0b1
Merge branch 'master' into merge
Vighnesh-V Apr 5, 2024
2e1c040
Merge branch 'upstream' into merge
Vighnesh-V Apr 5, 2024
9cb93a9
manually fix cmake configuration error
Vighnesh-V Apr 5, 2024
0f19739
remove trailing .
Vighnesh-V Apr 5, 2024
5aa6d99
transplant game engine fix for memory safety issues in normalization …
Vighnesh-V Apr 5, 2024
0f0c0e4
Sync to upstream/release/621
vegorov-rbx Apr 12, 2024
7c346a0
Merge branch 'master' into merge
vegorov-rbx Apr 12, 2024
f97e96d
Merge branch 'upstream' into merge
vegorov-rbx Apr 12, 2024
858b93a
Sync fixup
vegorov-rbx Apr 12, 2024
67b9145
Sync to upstream/release/622
aatxe Apr 19, 2024
5cf508a
Merge branch 'master' into merge
aatxe Apr 19, 2024
641e9f6
Merge branch 'upstream' into merge
aatxe Apr 19, 2024
50a2f8d
Sync to upstream/release/623
alexmccord Apr 25, 2024
8d0a650
Merge branch 'master' into merge
alexmccord Apr 25, 2024
76ed1a5
Merge branch 'heads/upstream' into merge
alexmccord Apr 25, 2024
88dd289
Fix missing include.
alexmccord Apr 25, 2024
93468ca
Sync to upstream/release/624
andyfriesen May 3, 2024
f4ecf43
Merge branch 'master' into merge
andyfriesen May 3, 2024
1ad7b9c
Merge branch 'upstream' into merge
andyfriesen May 3, 2024
9bce20c
Sync to upstream/release/625
Vighnesh-V May 10, 2024
f76a99b
Merge branch 'master' into merge
Vighnesh-V May 10, 2024
f172471
Merge branch 'upstream' into merge
Vighnesh-V May 10, 2024
0386eec
Sync to upstream/release/626
vegorov-rbx May 16, 2024
e5de2ed
Merge branch 'master' into merge
vegorov-rbx May 16, 2024
ca46dd6
Merge branch 'upstream' into merge
vegorov-rbx May 16, 2024
0f61e4e
Merge fix
vegorov-rbx May 16, 2024
bad9e14
627
aatxe May 26, 2024
26fb155
Merge branch 'master' into merge
aatxe May 26, 2024
241fcf8
Merge branch 'upstream' into merge
aatxe May 26, 2024
fede4d6
Sync to upstream/release/628
alexmccord May 31, 2024
09e46d1
Merge branch 'master' into merge
alexmccord May 31, 2024
93a89dc
Merge branch 'heads/upstream' into merge
alexmccord May 31, 2024
5dd9735
Sync to upstream/release/629
andyfriesen Jun 7, 2024
eae092a
Merge branch 'master' into merge
andyfriesen Jun 7, 2024
40e0316
Merge branch 'upstream' into merge
andyfriesen Jun 7, 2024
58b9809
Sync to upstream/release/630
Vighnesh-V Jun 14, 2024
91790ef
Merge branch 'master' into merge
Vighnesh-V Jun 14, 2024
2a1359d
Merge branch 'upstream' into merge
Vighnesh-V Jun 14, 2024
1ba3e5f
correct the flag name
Vighnesh-V Jun 14, 2024
816cb1d
Sync to upstream/release/631
vegorov-rbx Jun 20, 2024
5d2e3de
Merge branch 'master' into merge
vegorov-rbx Jun 20, 2024
dafb44d
Merge branch 'upstream' into merge
vegorov-rbx Jun 20, 2024
240a9d8
Sync to upstream/release/632
aatxe Jun 29, 2024
c5a2a4b
Merge branch 'master' into merge
aatxe Jun 29, 2024
da48758
Merge branch 'upstream' into merge
aatxe Jun 29, 2024
cfcb545
Sync to upstream/release/633
Vighnesh-V Jul 8, 2024
2010be1
Merge branch 'master' into merge
Vighnesh-V Jul 8, 2024
bc1bead
Merge branch 'upstream' into merge
Vighnesh-V Jul 8, 2024
1c1476f
Sync to upstream/release/634
joonyoo181 Jul 11, 2024
a62f661
Merge branch 'master' into merge
joonyoo181 Jul 11, 2024
5a23350
Merge branch 'upstream' into merge
joonyoo181 Jul 11, 2024
6fd26c5
Sync to upstream/release/635
Vighnesh-V Jul 19, 2024
79966e9
Merge branch 'master' into merge
Vighnesh-V Jul 19, 2024
ac97a49
Merge branch 'upstream' into merge
Vighnesh-V Jul 19, 2024
7dd10b1
Sync to upstream/release/636
joonyoo181 Jul 26, 2024
fab4eec
Merge branch 'master' into merge
joonyoo181 Jul 26, 2024
48c0e9f
Merge branch 'upstream' into merge
joonyoo181 Jul 26, 2024
bb7d5cf
StudioReportLuauAny added to ExperimentalFlags
joonyoo181 Jul 26, 2024
28c48cf
Skip StudioReportLuauAny flag in tests
joonyoo181 Jul 26, 2024
fad8aaf
Sync to upstream/release/637
joonyoo181 Aug 1, 2024
5b40152
Merge branch 'master' into merge
joonyoo181 Aug 1, 2024
1adbd45
Merge branch 'upstream' into merge
joonyoo181 Aug 1, 2024
8a99f25
Sync to upstream/release/638
andyfriesen Aug 9, 2024
057bdf3
Merge branch 'master' into merge
andyfriesen Aug 9, 2024
c229a9e
Merge branch 'upstream' into merge
andyfriesen Aug 9, 2024
497c3ed
Sync to upstream/release/639
Vighnesh-V Aug 16, 2024
8c4f907
Merge branch 'master' into merge
Vighnesh-V Aug 16, 2024
3613ee9
Merge branch 'upstream' into merge
Vighnesh-V Aug 16, 2024
ebdbcb1
Sync to upstream/release/640
vegorov-rbx Aug 23, 2024
caeba5a
Merge branch 'master' into merge
vegorov-rbx Aug 23, 2024
d414b56
Merge branch 'upstream' into merge
vegorov-rbx Aug 23, 2024
5b9344a
Missing sync elements
vegorov-rbx Aug 23, 2024
25db8ff
Success, DCR mode no longer fails any tests
vegorov-rbx Aug 23, 2024
a74031b
Sync release to upstream/release/641
aatxe Aug 30, 2024
78ae885
Merge branch 'master' into merge
aatxe Aug 30, 2024
f86f0a4
Merge branch 'upstream' into merge
aatxe Aug 30, 2024
15557d8
Sync to upstream/release/642
andyfriesen Sep 6, 2024
538b0c0
Merge branch 'master' into merge
andyfriesen Sep 6, 2024
ef8e1e3
Merge branch 'upstream' into merge
andyfriesen Sep 6, 2024
cd27a20
Sync to upstream/release/643
Vighnesh-V Sep 13, 2024
23e9fa5
Merge branch 'master' into merge
Vighnesh-V Sep 13, 2024
4df4a1d
Merge branch 'upstream' into merge
Vighnesh-V Sep 13, 2024
a45eb2c
Sync to upstream/release/644
vegorov-rbx Sep 20, 2024
d66e088
Merge branch 'master' into merge
vegorov-rbx Sep 20, 2024
0d6b70b
Merge branch 'upstream' into merge
vegorov-rbx Sep 20, 2024
66ba360
Smaller limit under ASAN for autocomplete_subtyping_recursion_limit
vegorov-rbx Sep 20, 2024
9655780
Reduce it even more
vegorov-rbx Sep 20, 2024
0106dfa
Maybe reduce the base
vegorov-rbx Sep 20, 2024
48f3c85
Maybe more?
vegorov-rbx Sep 20, 2024
45594a5
Fixed the issue
vegorov-rbx Sep 20, 2024
7a7521a
Sync to upstream/release/645
aatxe Sep 27, 2024
e888049
Merge branch 'master' into merge
aatxe Sep 27, 2024
a3da985
Merge branch 'upstream' into merge
aatxe Sep 27, 2024
d7bbe3f
fix cmake for user-defined type functions
aatxe Sep 27, 2024
8531df0
Sync to upstream/release/646
andyfriesen Oct 4, 2024
469ba77
Merge branch 'master' into merge
andyfriesen Oct 4, 2024
aabaf01
Merge branch 'upstream' into merge
andyfriesen Oct 4, 2024
aa2e5c0
Sync to upstream/release/647
Vighnesh-V Oct 11, 2024
40a054a
Merge branch 'master' into merge
Vighnesh-V Oct 11, 2024
912798e
Merge branch 'upstream' into merge
Vighnesh-V Oct 11, 2024
afa4fa6
try to disable self-move warning
Vighnesh-V Oct 11, 2024
0e1504f
try a different syntax for disabling warnings
Vighnesh-V Oct 11, 2024
38d76e6
disable maybe uninitialized error
Vighnesh-V Oct 11, 2024
5bb24aa
nit: turn int osize, nsize into size_t
Vighnesh-V Oct 11, 2024
a02bee5
update -Wmaybe-uninitialized
Vighnesh-V Oct 11, 2024
f52fe9f
nit - remove shared code allocator test section that tests self move
Vighnesh-V Oct 11, 2024
69776f6
re-add assertion
Vighnesh-V Oct 11, 2024
ee6a45b
more macro madness
Vighnesh-V Oct 11, 2024
74c1ac3
nit - insert new lines
Vighnesh-V Oct 11, 2024
70d5a0e
newline
Vighnesh-V Oct 11, 2024
34801b9
Delete tests/.#TypeVar.test.cpp
Vighnesh-V Oct 11, 2024
39899ad
macro out the failing tests
Vighnesh-V Oct 11, 2024
ef95ce5
newline
Vighnesh-V Oct 11, 2024
a197f04
i messed up the macro syntax again
Vighnesh-V Oct 11, 2024
68b9214
push same change to shared code allocator
Vighnesh-V Oct 11, 2024
507832b
default initialize
Vighnesh-V Oct 11, 2024
b76941b
annotate this optional use
Vighnesh-V Oct 11, 2024
848fa0b
insert new lines
Vighnesh-V Oct 11, 2024
c9ff5d1
nest pragma
Vighnesh-V Oct 11, 2024
dafee8b
nest again
Vighnesh-V Oct 11, 2024
50e8dd0
more macro crimes
Vighnesh-V Oct 11, 2024
b1fae55
nit differ
Vighnesh-V Oct 11, 2024
0276d18
one more try
Vighnesh-V Oct 11, 2024
b5d3544
update build flags
Vighnesh-V Oct 11, 2024
03c9fa7
try again?
Vighnesh-V Oct 11, 2024
a7324ce
what happens if we remove the flag
Vighnesh-V Oct 11, 2024
5d74685
unconditially add suppressing flag
Vighnesh-V Oct 11, 2024
837bba3
revert cmake file + update makefile
Vighnesh-V Oct 11, 2024
268e0b2
revert differ.h change
Vighnesh-V Oct 12, 2024
fb8c190
replicate changes to cmakelists
Vighnesh-V Oct 12, 2024
47e3123
Sync to upstream/release/648
vegorov-rbx Oct 18, 2024
bbd18bf
Merge branch 'master' into merge
vegorov-rbx Oct 18, 2024
ce9f1eb
Merge branch 'upstream' into merge
vegorov-rbx Oct 18, 2024
1de169f
Sync to upstream/release/649
aatxe Oct 25, 2024
ed05da5
Merge branch 'master' into merge
aatxe Oct 25, 2024
e85fb91
Merge branch 'upstream' into merge
aatxe Oct 25, 2024
ee5b473
Sync to upstream/release/650
andyfriesen Nov 1, 2024
25de210
Merge branch 'master' into merge
andyfriesen Nov 1, 2024
c6cf1f8
Merge branch 'upstream' into merge
andyfriesen Nov 1, 2024
c799a54
Sync to version/652
hgoldstein Nov 8, 2024
4399b17
Merge branch 'master' into merge
hgoldstein Nov 8, 2024
af9d9ba
Merge branch 'upstream' into merge
hgoldstein Nov 8, 2024
df67e4d
Add headers missing when compiling with GCC
hgoldstein Nov 8, 2024
9dc829b
Use `size_t` in `getDocumentOffsets`
hgoldstein Nov 8, 2024
f6f4d92
Sync to upstream/release/652
vrn-sn Nov 15, 2024
3c87474
Merge branch 'master' into merge
vrn-sn Nov 15, 2024
ebd0748
Merge branch 'upstream' into merge
vrn-sn Nov 15, 2024
4709fec
Parser.test.cpp: auto (int) -> size_t
vrn-sn Nov 15, 2024
dd7a19d
Merge branch 'master' into merge
ayoungbloodrbx Nov 22, 2024
0bd9321
Sync to upstream/release/653
ayoungbloodrbx Nov 22, 2024
4fa6e97
Merge branch 'upstream' into merge
ayoungbloodrbx Nov 22, 2024
230ab81
Sync to upstream/release/654
aviralg Dec 2, 2024
341aa38
Merge branch 'master' into merge
aviralg Dec 2, 2024
dfdcff0
Merge branch 'upstream' into merge
aviralg Dec 2, 2024
906a00d
Sync to upstream/release/655
Vighnesh-V Dec 13, 2024
79cdfe1
Merge branch 'master' into merge
Vighnesh-V Dec 13, 2024
87eac7b
Merge branch 'upstream' into merge
Vighnesh-V Dec 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Analysis/include/Luau/EqSatSimplificationImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ LUAU_EQSAT_NODE_SET(Intersection);

LUAU_EQSAT_NODE_ARRAY(Negation, 1);

LUAU_EQSAT_NODE_ATOM_WITH_VECTOR(TTypeFun, const TypeFunction*);
LUAU_EQSAT_NODE_ATOM_WITH_VECTOR(TTypeFun, std::shared_ptr<const TypeFunctionInstanceType>);

LUAU_EQSAT_UNIT(TNoRefine);
LUAU_EQSAT_UNIT(Invalid);
Expand Down Expand Up @@ -218,6 +218,7 @@ struct Simplifier
void simplifyUnion(Id id);
void uninhabitedIntersection(Id id);
void intersectWithNegatedClass(Id id);
void intersectWithNegatedAtom(Id id);
void intersectWithNoRefine(Id id);
void cyclicIntersectionOfUnion(Id id);
void cyclicUnionOfIntersection(Id id);
Expand All @@ -228,6 +229,7 @@ struct Simplifier
void unneededTableModification(Id id);
void builtinTypeFunctions(Id id);
void iffyTypeFunctions(Id id);
void strictMetamethods(Id id);
};

template<typename Tag>
Expand Down
1 change: 1 addition & 0 deletions Analysis/include/Luau/NonStrictTypeChecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ struct TypeCheckLimits;

void checkNonStrict(
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<InternalErrorReporter> ice,
NotNull<UnifierSharedState> unifierState,
Expand Down
19 changes: 17 additions & 2 deletions Analysis/include/Luau/Normalize.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
#pragma once

#include "Luau/EqSatSimplification.h"
#include "Luau/NotNull.h"
#include "Luau/Set.h"
#include "Luau/TypeFwd.h"
Expand All @@ -21,8 +22,22 @@ struct Scope;

using ModulePtr = std::shared_ptr<Module>;

bool isSubtype(TypeId subTy, TypeId superTy, NotNull<Scope> scope, NotNull<BuiltinTypes> builtinTypes, InternalErrorReporter& ice);
bool isSubtype(TypePackId subTy, TypePackId superTy, NotNull<Scope> scope, NotNull<BuiltinTypes> builtinTypes, InternalErrorReporter& ice);
bool isSubtype(
TypeId subTy,
TypeId superTy,
NotNull<Scope> scope,
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
InternalErrorReporter& ice
);
bool isSubtype(
TypePackId subPack,
TypePackId superPack,
NotNull<Scope> scope,
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
InternalErrorReporter& ice
);

class TypeIds
{
Expand Down
10 changes: 7 additions & 3 deletions Analysis/include/Luau/OverloadResolution.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
#pragma once

#include "Luau/Ast.h"
#include "Luau/EqSatSimplification.h"
#include "Luau/Error.h"
#include "Luau/InsertionOrderedMap.h"
#include "Luau/NotNull.h"
#include "Luau/TypeFwd.h"
#include "Luau/Location.h"
#include "Luau/Error.h"
#include "Luau/NotNull.h"
#include "Luau/Subtyping.h"
#include "Luau/TypeFwd.h"

namespace Luau
{
Expand All @@ -34,6 +35,7 @@ struct OverloadResolver
OverloadResolver(
NotNull<BuiltinTypes> builtinTypes,
NotNull<TypeArena> arena,
NotNull<Simplifier> simplifier,
NotNull<Normalizer> normalizer,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<Scope> scope,
Expand All @@ -44,6 +46,7 @@ struct OverloadResolver

NotNull<BuiltinTypes> builtinTypes;
NotNull<TypeArena> arena;
NotNull<Simplifier> simplifier;
NotNull<Normalizer> normalizer;
NotNull<TypeFunctionRuntime> typeFunctionRuntime;
NotNull<Scope> scope;
Expand Down Expand Up @@ -110,6 +113,7 @@ struct SolveResult
SolveResult solveFunctionCall(
NotNull<TypeArena> arena,
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
NotNull<Normalizer> normalizer,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<InternalErrorReporter> iceReporter,
Expand Down
4 changes: 4 additions & 0 deletions Analysis/include/Luau/Scope.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ struct Scope
void inheritAssignments(const ScopePtr& childScope);
void inheritRefinements(const ScopePtr& childScope);

// Track globals that should emit warnings during type checking.
DenseHashSet<std::string> globalsToWarn{""};
bool shouldWarnGlobal(std::string name) const;

// For mutually recursive type aliases, it's important that
// they use the same types for the same names.
// For instance, in `type Tree<T> { data: T, children: Forest<T> } type Forest<T> = {Tree<T>}`
Expand Down
9 changes: 6 additions & 3 deletions Analysis/include/Luau/Subtyping.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
#pragma once

#include "Luau/DenseHash.h"
#include "Luau/EqSatSimplification.h"
#include "Luau/Set.h"
#include "Luau/TypeCheckLimits.h"
#include "Luau/TypeFunction.h"
#include "Luau/TypeFwd.h"
#include "Luau/TypePairHash.h"
#include "Luau/TypePath.h"
#include "Luau/TypeFunction.h"
#include "Luau/TypeCheckLimits.h"
#include "Luau/DenseHash.h"

#include <vector>
#include <optional>
Expand Down Expand Up @@ -134,6 +135,7 @@ struct Subtyping
{
NotNull<BuiltinTypes> builtinTypes;
NotNull<TypeArena> arena;
NotNull<Simplifier> simplifier;
NotNull<Normalizer> normalizer;
NotNull<TypeFunctionRuntime> typeFunctionRuntime;
NotNull<InternalErrorReporter> iceReporter;
Expand All @@ -155,6 +157,7 @@ struct Subtyping
Subtyping(
NotNull<BuiltinTypes> builtinTypes,
NotNull<TypeArena> typeArena,
NotNull<Simplifier> simplifier,
NotNull<Normalizer> normalizer,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<InternalErrorReporter> iceReporter
Expand Down
3 changes: 2 additions & 1 deletion Analysis/include/Luau/Type.h
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,8 @@ struct UserDefinedFunctionData
// References to AST elements are owned by the Module allocator which also stores this type
AstStatTypeFunction* definition = nullptr;

DenseHashMap<Name, AstStatTypeFunction*> environment{""};
DenseHashMap<Name, std::pair<AstStatTypeFunction*, size_t>> environment{""};
DenseHashMap<Name, AstStatTypeFunction*> environment_DEPRECATED{""};
};

/**
Expand Down
15 changes: 11 additions & 4 deletions Analysis/include/Luau/TypeChecker2.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

#pragma once

#include "Luau/Common.h"
#include "Luau/EqSatSimplification.h"
#include "Luau/Error.h"
#include "Luau/Normalize.h"
#include "Luau/NotNull.h"
#include "Luau/Common.h"
#include "Luau/TypeUtils.h"
#include "Luau/Subtyping.h"
#include "Luau/Type.h"
#include "Luau/TypeFwd.h"
#include "Luau/TypeOrPack.h"
#include "Luau/Normalize.h"
#include "Luau/Subtyping.h"
#include "Luau/TypeUtils.h"

namespace Luau
{
Expand Down Expand Up @@ -60,6 +61,7 @@ struct Reasonings

void check(
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<UnifierSharedState> sharedState,
NotNull<TypeCheckLimits> limits,
Expand All @@ -71,6 +73,7 @@ void check(
struct TypeChecker2
{
NotNull<BuiltinTypes> builtinTypes;
NotNull<Simplifier> simplifier;
NotNull<TypeFunctionRuntime> typeFunctionRuntime;
DcrLogger* logger;
const NotNull<TypeCheckLimits> limits;
Expand All @@ -90,6 +93,7 @@ struct TypeChecker2

TypeChecker2(
NotNull<BuiltinTypes> builtinTypes,
NotNull<Simplifier> simplifier,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<UnifierSharedState> unifierState,
NotNull<TypeCheckLimits> limits,
Expand Down Expand Up @@ -213,6 +217,9 @@ struct TypeChecker2
std::vector<TypeError>& errors
);

// Avoid duplicate warnings being emitted for the same global variable.
DenseHashSet<std::string> warnedGlobals{""};

void diagnoseMissingTableKey(UnknownProperty* utk, TypeErrorData& data) const;
bool isErrorSuppressing(Location loc, TypeId ty);
bool isErrorSuppressing(Location loc1, TypeId ty1, Location loc2, TypeId ty2);
Expand Down
33 changes: 29 additions & 4 deletions Analysis/include/Luau/TypeFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#pragma once

#include "Luau/Constraint.h"
#include "Luau/EqSatSimplification.h"
#include "Luau/Error.h"
#include "Luau/NotNull.h"
#include "Luau/TypeCheckLimits.h"
Expand Down Expand Up @@ -41,9 +42,15 @@ struct TypeFunctionRuntime

StateRef state;

// Set of functions which have their environment table initialized
DenseHashSet<AstStatTypeFunction*> initialized{nullptr};

// Evaluation of type functions should only be performed in the absence of parse errors in the source module
bool allowEvaluation = true;

// Output created by 'print' function
std::vector<std::string> messages;

private:
void prepareState();
};
Expand All @@ -53,6 +60,7 @@ struct TypeFunctionContext
NotNull<TypeArena> arena;
NotNull<BuiltinTypes> builtins;
NotNull<Scope> scope;
NotNull<Simplifier> simplifier;
NotNull<Normalizer> normalizer;
NotNull<TypeFunctionRuntime> typeFunctionRuntime;
NotNull<InternalErrorReporter> ice;
Expand All @@ -71,6 +79,7 @@ struct TypeFunctionContext
NotNull<TypeArena> arena,
NotNull<BuiltinTypes> builtins,
NotNull<Scope> scope,
NotNull<Simplifier> simplifier,
NotNull<Normalizer> normalizer,
NotNull<TypeFunctionRuntime> typeFunctionRuntime,
NotNull<InternalErrorReporter> ice,
Expand All @@ -79,6 +88,7 @@ struct TypeFunctionContext
: arena(arena)
, builtins(builtins)
, scope(scope)
, simplifier(simplifier)
, normalizer(normalizer)
, typeFunctionRuntime(typeFunctionRuntime)
, ice(ice)
Expand All @@ -91,19 +101,31 @@ struct TypeFunctionContext
NotNull<Constraint> pushConstraint(ConstraintV&& c) const;
};

enum class Reduction
{
// The type function is either known to be reducible or the determination is blocked.
MaybeOk,
// The type function is known to be irreducible, but maybe not be erroneous, e.g. when it's over generics or free types.
Irreducible,
// The type function is known to be irreducible, and is definitely erroneous.
Erroneous,
};

/// Represents a reduction result, which may have successfully reduced the type,
/// may have concretely failed to reduce the type, or may simply be stuck
/// without more information.
template<typename Ty>
struct TypeFunctionReductionResult
{

/// The result of the reduction, if any. If this is nullopt, the type function
/// could not be reduced.
std::optional<Ty> result;
/// Whether the result is uninhabited: whether we know, unambiguously and
/// permanently, whether this type function reduction results in an
/// uninhabitable type. This will trigger an error to be reported.
bool uninhabited;
/// Indicates the status of this reduction: is `Reduction::Irreducible` if
/// the this result indicates the type function is irreducible, and
/// `Reduction::Erroneous` if this result indicates the type function is
/// erroneous. `Reduction::MaybeOk` otherwise.
Reduction reductionStatus;
/// Any types that need to be progressed or mutated before the reduction may
/// proceed.
std::vector<TypeId> blockedTypes;
Expand All @@ -112,6 +134,8 @@ struct TypeFunctionReductionResult
std::vector<TypePackId> blockedPacks;
/// A runtime error message from user-defined type functions
std::optional<std::string> error;
/// Messages printed out from user-defined type functions
std::vector<std::string> messages;
};

template<typename T>
Expand Down Expand Up @@ -145,6 +169,7 @@ struct TypePackFunction
struct FunctionGraphReductionResult
{
ErrorVec errors;
ErrorVec messages;
DenseHashSet<TypeId> blockedTypes{nullptr};
DenseHashSet<TypePackId> blockedPacks{nullptr};
DenseHashSet<TypeId> reducedTypes{nullptr};
Expand Down
5 changes: 4 additions & 1 deletion Analysis/src/AutocompleteCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ static bool checkTypeMatch(TypeId subTy, TypeId superTy, NotNull<Scope> scope, T
{
InternalErrorReporter iceReporter;
UnifierSharedState unifierState(&iceReporter);
SimplifierPtr simplifier = newSimplifier(NotNull{typeArena}, builtinTypes);
Normalizer normalizer{typeArena, builtinTypes, NotNull{&unifierState}};

if (FFlag::LuauSolverV2)
Expand All @@ -162,7 +163,9 @@ static bool checkTypeMatch(TypeId subTy, TypeId superTy, NotNull<Scope> scope, T
unifierState.counters.recursionLimit = FInt::LuauTypeInferRecursionLimit;
unifierState.counters.iterationLimit = FInt::LuauTypeInferIterationLimit;

Subtyping subtyping{builtinTypes, NotNull{typeArena}, NotNull{&normalizer}, NotNull{&typeFunctionRuntime}, NotNull{&iceReporter}};
Subtyping subtyping{
builtinTypes, NotNull{typeArena}, NotNull{simplifier.get()}, NotNull{&normalizer}, NotNull{&typeFunctionRuntime}, NotNull{&iceReporter}
};

return subtyping.isSubtype(subTy, superTy, scope).isSubtype;
}
Expand Down
Loading
Loading