mirror of
https://github.com/luau-lang/luau.git
synced 2025-04-19 11:13:49 +01:00
ce8495a69e
# What's Changed? - Code refactoring with a new clang-format - More bug fixes / test case fixes in the new solver ## New Solver - More precise telemetry collection of `any` types - Simplification of two completely disjoint tables combines them into a single table that inherits all properties / indexers - Refining a `never & <anything>` does not produce type family types nor constraints - Silence "inference failed to complete" error when it is the only error reported --- ### Internal Contributors Co-authored-by: Aaron Weiss <aaronweiss@roblox.com> Co-authored-by: Andy Friesen <afriesen@roblox.com> Co-authored-by: Dibri Nsofor <dnsofor@roblox.com> Co-authored-by: Jeremy Yoo <jyoo@roblox.com> Co-authored-by: Vighnesh Vijay <vvijay@roblox.com> Co-authored-by: Vyacheslav Egorov <vegorov@roblox.com> --------- Co-authored-by: Aaron Weiss <aaronweiss@roblox.com> Co-authored-by: Alexander McCord <amccord@roblox.com> Co-authored-by: Andy Friesen <afriesen@roblox.com> Co-authored-by: Vighnesh <vvijay@roblox.com> Co-authored-by: Aviral Goel <agoel@roblox.com> Co-authored-by: David Cope <dcope@roblox.com> Co-authored-by: Lily Brown <lbrown@roblox.com> Co-authored-by: Vyacheslav Egorov <vegorov@roblox.com>
88 lines
2.6 KiB
C++
88 lines
2.6 KiB
C++
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
|
|
#include "Luau/Instantiation2.h"
|
|
|
|
namespace Luau
|
|
{
|
|
|
|
bool Instantiation2::ignoreChildren(TypeId ty)
|
|
{
|
|
if (get<ClassType>(ty))
|
|
return true;
|
|
|
|
if (auto ftv = get<FunctionType>(ty))
|
|
{
|
|
if (ftv->hasNoFreeOrGenericTypes)
|
|
return false;
|
|
|
|
// If this function type quantifies over these generics, we don't want substitution to
|
|
// go any further into them because it's being shadowed in this case.
|
|
for (auto generic : ftv->generics)
|
|
if (genericSubstitutions.contains(generic))
|
|
return true;
|
|
|
|
for (auto generic : ftv->genericPacks)
|
|
if (genericPackSubstitutions.contains(generic))
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Instantiation2::isDirty(TypeId ty)
|
|
{
|
|
return get<GenericType>(ty) && genericSubstitutions.contains(ty);
|
|
}
|
|
|
|
bool Instantiation2::isDirty(TypePackId tp)
|
|
{
|
|
return get<GenericTypePack>(tp) && genericPackSubstitutions.contains(tp);
|
|
}
|
|
|
|
TypeId Instantiation2::clean(TypeId ty)
|
|
{
|
|
TypeId substTy = follow(genericSubstitutions[ty]);
|
|
const FreeType* ft = get<FreeType>(substTy);
|
|
|
|
// violation of the substitution invariant if this is not a free type.
|
|
LUAU_ASSERT(ft);
|
|
|
|
// if we didn't learn anything about the lower bound, we pick the upper bound instead.
|
|
// we default to the lower bound which represents the most specific type for the free type.
|
|
TypeId res = get<NeverType>(ft->lowerBound) ? ft->upperBound : ft->lowerBound;
|
|
|
|
// Instantiation should not traverse into the type that we are substituting for.
|
|
dontTraverseInto(res);
|
|
|
|
return res;
|
|
}
|
|
|
|
TypePackId Instantiation2::clean(TypePackId tp)
|
|
{
|
|
TypePackId res = genericPackSubstitutions[tp];
|
|
dontTraverseInto(res);
|
|
return res;
|
|
}
|
|
|
|
std::optional<TypeId> instantiate2(
|
|
TypeArena* arena,
|
|
DenseHashMap<TypeId, TypeId> genericSubstitutions,
|
|
DenseHashMap<TypePackId, TypePackId> genericPackSubstitutions,
|
|
TypeId ty
|
|
)
|
|
{
|
|
Instantiation2 instantiation{arena, std::move(genericSubstitutions), std::move(genericPackSubstitutions)};
|
|
return instantiation.substitute(ty);
|
|
}
|
|
|
|
std::optional<TypePackId> instantiate2(
|
|
TypeArena* arena,
|
|
DenseHashMap<TypeId, TypeId> genericSubstitutions,
|
|
DenseHashMap<TypePackId, TypePackId> genericPackSubstitutions,
|
|
TypePackId tp
|
|
)
|
|
{
|
|
Instantiation2 instantiation{arena, std::move(genericSubstitutions), std::move(genericPackSubstitutions)};
|
|
return instantiation.substitute(tp);
|
|
}
|
|
|
|
} // namespace Luau
|