mirror of
https://github.com/luau-lang/luau.git
synced 2025-01-09 21:09:10 +00:00
97965c7c0a
* `ClassType` can now have an indexer defined on it. This allows custom types to be used in `t[x]` expressions. * Fixed search for closest executable breakpoint line. Previously, breakpoints might have been skipped in `else` blocks at the end of a function * Fixed how unification is performed for two optional types `a? <: b?`, previously it might have unified either 'a' or 'b' with 'nil'. Note that this fix is not enabled by default yet (see the list in `ExperimentalFlags.h`) In the new type solver, a concept of 'Type Families' has been introduced. Type families can be thought of as type aliases with custom type inference/reduction logic included with them. For example, we can have an `Add<T, U>` type family that will resolve the type that is the result of adding two values together. This will help type inference to figure out what 'T' and 'U' might be when explicit type annotations are not provided. In this update we don't define any type families, but they will be added in the near future. It is also possible for Luau embedders to define their own type families in the global/environment scope. Other changes include: * Fixed scope used to find out which generic types should be included in the function generic type list * Fixed a crash after cyclic bound types were created during unification And in native code generation (jit): * Use of arm64 target on M1 now requires macOS 13 * Entry into native code has been optimized. This is especially important for coroutine call/pcall performance as they involve going through a C call frame * LOP_LOADK(X) translation into IR has been improved to enable type tag/constant propagation * arm64 can use integer immediate values to synthesize floating-point values * x64 assembler removes duplicate 64bit numbers from the data section to save space * Linux `perf` can now be used to profile native Luau code (when running with --codegen-perf CLI argument)
521 lines
14 KiB
C++
521 lines
14 KiB
C++
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
|
|
#include "Luau/TxnLog.h"
|
|
|
|
#include "Luau/Scope.h"
|
|
#include "Luau/ToString.h"
|
|
#include "Luau/TypeArena.h"
|
|
#include "Luau/TypePack.h"
|
|
|
|
#include <algorithm>
|
|
#include <stdexcept>
|
|
|
|
LUAU_FASTFLAG(DebugLuauDeferredConstraintResolution)
|
|
|
|
namespace Luau
|
|
{
|
|
|
|
const std::string nullPendingResult = "<nullptr>";
|
|
|
|
std::string toString(PendingType* pending)
|
|
{
|
|
if (pending == nullptr)
|
|
return nullPendingResult;
|
|
|
|
return toString(pending->pending);
|
|
}
|
|
|
|
std::string dump(PendingType* pending)
|
|
{
|
|
if (pending == nullptr)
|
|
{
|
|
printf("%s\n", nullPendingResult.c_str());
|
|
return nullPendingResult;
|
|
}
|
|
|
|
ToStringOptions opts;
|
|
opts.exhaustive = true;
|
|
opts.functionTypeArguments = true;
|
|
std::string result = toString(pending->pending, opts);
|
|
printf("%s\n", result.c_str());
|
|
return result;
|
|
}
|
|
|
|
std::string toString(PendingTypePack* pending)
|
|
{
|
|
if (pending == nullptr)
|
|
return nullPendingResult;
|
|
|
|
return toString(pending->pending);
|
|
}
|
|
|
|
std::string dump(PendingTypePack* pending)
|
|
{
|
|
if (pending == nullptr)
|
|
{
|
|
printf("%s\n", nullPendingResult.c_str());
|
|
return nullPendingResult;
|
|
}
|
|
|
|
ToStringOptions opts;
|
|
opts.exhaustive = true;
|
|
opts.functionTypeArguments = true;
|
|
std::string result = toString(pending->pending, opts);
|
|
printf("%s\n", result.c_str());
|
|
return result;
|
|
}
|
|
|
|
static const TxnLog emptyLog;
|
|
|
|
const TxnLog* TxnLog::empty()
|
|
{
|
|
return &emptyLog;
|
|
}
|
|
|
|
void TxnLog::concat(TxnLog rhs)
|
|
{
|
|
for (auto& [ty, rep] : rhs.typeVarChanges)
|
|
{
|
|
if (rep->dead)
|
|
continue;
|
|
typeVarChanges[ty] = std::move(rep);
|
|
}
|
|
|
|
for (auto& [tp, rep] : rhs.typePackChanges)
|
|
typePackChanges[tp] = std::move(rep);
|
|
}
|
|
|
|
void TxnLog::concatAsIntersections(TxnLog rhs, NotNull<TypeArena> arena)
|
|
{
|
|
for (auto& [ty, rightRep] : rhs.typeVarChanges)
|
|
{
|
|
if (rightRep->dead)
|
|
continue;
|
|
|
|
if (auto leftRep = typeVarChanges.find(ty); leftRep && !(*leftRep)->dead)
|
|
{
|
|
TypeId leftTy = arena->addType((*leftRep)->pending);
|
|
TypeId rightTy = arena->addType(rightRep->pending);
|
|
typeVarChanges[ty]->pending.ty = IntersectionType{{leftTy, rightTy}};
|
|
}
|
|
else
|
|
typeVarChanges[ty] = std::move(rightRep);
|
|
}
|
|
|
|
for (auto& [tp, rep] : rhs.typePackChanges)
|
|
typePackChanges[tp] = std::move(rep);
|
|
}
|
|
|
|
void TxnLog::concatAsUnion(TxnLog rhs, NotNull<TypeArena> arena)
|
|
{
|
|
if (FFlag::DebugLuauDeferredConstraintResolution)
|
|
{
|
|
/*
|
|
* Check for cycles.
|
|
*
|
|
* We must not combine a log entry that binds 'a to 'b with a log that
|
|
* binds 'b to 'a.
|
|
*
|
|
* Of the two, identify the one with the 'bigger' scope and eliminate the
|
|
* entry that rebinds it.
|
|
*/
|
|
for (const auto& [rightTy, rightRep] : rhs.typeVarChanges)
|
|
{
|
|
if (rightRep->dead)
|
|
continue;
|
|
|
|
// We explicitly use get_if here because we do not wish to do anything
|
|
// if the uncommitted type is already bound to something else.
|
|
const FreeType* rf = get_if<FreeType>(&rightTy->ty);
|
|
if (!rf)
|
|
continue;
|
|
|
|
const BoundType* rb = Luau::get<BoundType>(&rightRep->pending);
|
|
if (!rb)
|
|
continue;
|
|
|
|
const TypeId leftTy = rb->boundTo;
|
|
const FreeType* lf = get_if<FreeType>(&leftTy->ty);
|
|
if (!lf)
|
|
continue;
|
|
|
|
auto leftRep = typeVarChanges.find(leftTy);
|
|
if (!leftRep)
|
|
continue;
|
|
|
|
if ((*leftRep)->dead)
|
|
continue;
|
|
|
|
const BoundType* lb = Luau::get<BoundType>(&(*leftRep)->pending);
|
|
if (!lb)
|
|
continue;
|
|
|
|
if (lb->boundTo == rightTy)
|
|
{
|
|
// leftTy has been bound to rightTy, but rightTy has also been bound
|
|
// to leftTy. We find the one that belongs to the more deeply nested
|
|
// scope and remove it from the log.
|
|
const bool discardLeft = useScopes ? subsumes(lf->scope, rf->scope) : lf->level.subsumes(rf->level);
|
|
|
|
if (discardLeft)
|
|
(*leftRep)->dead = true;
|
|
else
|
|
rightRep->dead = true;
|
|
}
|
|
}
|
|
|
|
for (auto& [ty, rightRep] : rhs.typeVarChanges)
|
|
{
|
|
if (rightRep->dead)
|
|
continue;
|
|
|
|
if (auto leftRep = typeVarChanges.find(ty); leftRep && !(*leftRep)->dead)
|
|
{
|
|
TypeId leftTy = arena->addType((*leftRep)->pending);
|
|
TypeId rightTy = arena->addType(rightRep->pending);
|
|
|
|
if (follow(leftTy) == follow(rightTy))
|
|
typeVarChanges[ty] = std::move(rightRep);
|
|
else
|
|
typeVarChanges[ty]->pending.ty = UnionType{{leftTy, rightTy}};
|
|
}
|
|
else
|
|
typeVarChanges[ty] = std::move(rightRep);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for (auto& [ty, rightRep] : rhs.typeVarChanges)
|
|
{
|
|
if (auto leftRep = typeVarChanges.find(ty))
|
|
{
|
|
TypeId leftTy = arena->addType((*leftRep)->pending);
|
|
TypeId rightTy = arena->addType(rightRep->pending);
|
|
typeVarChanges[ty]->pending.ty = UnionType{{leftTy, rightTy}};
|
|
}
|
|
else
|
|
typeVarChanges[ty] = std::move(rightRep);
|
|
}
|
|
}
|
|
|
|
for (auto& [tp, rep] : rhs.typePackChanges)
|
|
typePackChanges[tp] = std::move(rep);
|
|
}
|
|
|
|
void TxnLog::commit()
|
|
{
|
|
for (auto& [ty, rep] : typeVarChanges)
|
|
{
|
|
if (!rep->dead)
|
|
asMutable(ty)->reassign(rep.get()->pending);
|
|
}
|
|
|
|
for (auto& [tp, rep] : typePackChanges)
|
|
asMutable(tp)->reassign(rep.get()->pending);
|
|
|
|
clear();
|
|
}
|
|
|
|
void TxnLog::clear()
|
|
{
|
|
typeVarChanges.clear();
|
|
typePackChanges.clear();
|
|
}
|
|
|
|
TxnLog TxnLog::inverse()
|
|
{
|
|
TxnLog inversed(sharedSeen);
|
|
|
|
for (auto& [ty, _rep] : typeVarChanges)
|
|
{
|
|
if (!_rep->dead)
|
|
inversed.typeVarChanges[ty] = std::make_unique<PendingType>(*ty);
|
|
}
|
|
|
|
for (auto& [tp, _rep] : typePackChanges)
|
|
inversed.typePackChanges[tp] = std::make_unique<PendingTypePack>(*tp);
|
|
|
|
return inversed;
|
|
}
|
|
|
|
bool TxnLog::haveSeen(TypeId lhs, TypeId rhs) const
|
|
{
|
|
return haveSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
void TxnLog::pushSeen(TypeId lhs, TypeId rhs)
|
|
{
|
|
pushSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
void TxnLog::popSeen(TypeId lhs, TypeId rhs)
|
|
{
|
|
popSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
bool TxnLog::haveSeen(TypePackId lhs, TypePackId rhs) const
|
|
{
|
|
return haveSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
void TxnLog::pushSeen(TypePackId lhs, TypePackId rhs)
|
|
{
|
|
pushSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
void TxnLog::popSeen(TypePackId lhs, TypePackId rhs)
|
|
{
|
|
popSeen((TypeOrPackId)lhs, (TypeOrPackId)rhs);
|
|
}
|
|
|
|
bool TxnLog::haveSeen(TypeOrPackId lhs, TypeOrPackId rhs) const
|
|
{
|
|
const std::pair<TypeOrPackId, TypeOrPackId> sortedPair = (lhs > rhs) ? std::make_pair(lhs, rhs) : std::make_pair(rhs, lhs);
|
|
if (sharedSeen->end() != std::find(sharedSeen->begin(), sharedSeen->end(), sortedPair))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void TxnLog::pushSeen(TypeOrPackId lhs, TypeOrPackId rhs)
|
|
{
|
|
const std::pair<TypeOrPackId, TypeOrPackId> sortedPair = (lhs > rhs) ? std::make_pair(lhs, rhs) : std::make_pair(rhs, lhs);
|
|
sharedSeen->push_back(sortedPair);
|
|
}
|
|
|
|
void TxnLog::popSeen(TypeOrPackId lhs, TypeOrPackId rhs)
|
|
{
|
|
const std::pair<TypeOrPackId, TypeOrPackId> sortedPair = (lhs > rhs) ? std::make_pair(lhs, rhs) : std::make_pair(rhs, lhs);
|
|
LUAU_ASSERT(sortedPair == sharedSeen->back());
|
|
sharedSeen->pop_back();
|
|
}
|
|
|
|
PendingType* TxnLog::queue(TypeId ty)
|
|
{
|
|
LUAU_ASSERT(!ty->persistent);
|
|
|
|
// Explicitly don't look in ancestors. If we have discovered something new
|
|
// about this type, we don't want to mutate the parent's state.
|
|
auto& pending = typeVarChanges[ty];
|
|
if (!pending || (*pending).dead)
|
|
{
|
|
pending = std::make_unique<PendingType>(*ty);
|
|
pending->pending.owningArena = nullptr;
|
|
}
|
|
|
|
return pending.get();
|
|
}
|
|
|
|
PendingTypePack* TxnLog::queue(TypePackId tp)
|
|
{
|
|
LUAU_ASSERT(!tp->persistent);
|
|
|
|
// Explicitly don't look in ancestors. If we have discovered something new
|
|
// about this type, we don't want to mutate the parent's state.
|
|
auto& pending = typePackChanges[tp];
|
|
if (!pending)
|
|
{
|
|
pending = std::make_unique<PendingTypePack>(*tp);
|
|
pending->pending.owningArena = nullptr;
|
|
}
|
|
|
|
return pending.get();
|
|
}
|
|
|
|
PendingType* TxnLog::pending(TypeId ty) const
|
|
{
|
|
// This function will technically work if `this` is nullptr, but this
|
|
// indicates a bug, so we explicitly assert.
|
|
LUAU_ASSERT(static_cast<const void*>(this) != nullptr);
|
|
|
|
for (const TxnLog* current = this; current; current = current->parent)
|
|
{
|
|
if (auto it = current->typeVarChanges.find(ty); it && !(*it)->dead)
|
|
return it->get();
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
PendingTypePack* TxnLog::pending(TypePackId tp) const
|
|
{
|
|
// This function will technically work if `this` is nullptr, but this
|
|
// indicates a bug, so we explicitly assert.
|
|
LUAU_ASSERT(static_cast<const void*>(this) != nullptr);
|
|
|
|
for (const TxnLog* current = this; current; current = current->parent)
|
|
{
|
|
if (auto it = current->typePackChanges.find(tp))
|
|
return it->get();
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
PendingType* TxnLog::replace(TypeId ty, Type replacement)
|
|
{
|
|
PendingType* newTy = queue(ty);
|
|
newTy->pending.reassign(replacement);
|
|
return newTy;
|
|
}
|
|
|
|
PendingTypePack* TxnLog::replace(TypePackId tp, TypePackVar replacement)
|
|
{
|
|
PendingTypePack* newTp = queue(tp);
|
|
newTp->pending.reassign(replacement);
|
|
return newTp;
|
|
}
|
|
|
|
PendingType* TxnLog::bindTable(TypeId ty, std::optional<TypeId> newBoundTo)
|
|
{
|
|
LUAU_ASSERT(get<TableType>(ty));
|
|
LUAU_ASSERT(ty != newBoundTo);
|
|
|
|
PendingType* newTy = queue(ty);
|
|
if (TableType* ttv = Luau::getMutable<TableType>(newTy))
|
|
ttv->boundTo = newBoundTo;
|
|
|
|
return newTy;
|
|
}
|
|
|
|
PendingType* TxnLog::changeLevel(TypeId ty, TypeLevel newLevel)
|
|
{
|
|
LUAU_ASSERT(get<FreeType>(ty) || get<TableType>(ty) || get<FunctionType>(ty));
|
|
|
|
PendingType* newTy = queue(ty);
|
|
if (FreeType* ftv = Luau::getMutable<FreeType>(newTy))
|
|
{
|
|
ftv->level = newLevel;
|
|
}
|
|
else if (TableType* ttv = Luau::getMutable<TableType>(newTy))
|
|
{
|
|
LUAU_ASSERT(ttv->state == TableState::Free || ttv->state == TableState::Generic);
|
|
ttv->level = newLevel;
|
|
}
|
|
else if (FunctionType* ftv = Luau::getMutable<FunctionType>(newTy))
|
|
{
|
|
ftv->level = newLevel;
|
|
}
|
|
|
|
return newTy;
|
|
}
|
|
|
|
PendingTypePack* TxnLog::changeLevel(TypePackId tp, TypeLevel newLevel)
|
|
{
|
|
LUAU_ASSERT(get<FreeTypePack>(tp));
|
|
|
|
PendingTypePack* newTp = queue(tp);
|
|
if (FreeTypePack* ftp = Luau::getMutable<FreeTypePack>(newTp))
|
|
{
|
|
ftp->level = newLevel;
|
|
}
|
|
|
|
return newTp;
|
|
}
|
|
|
|
PendingType* TxnLog::changeScope(TypeId ty, NotNull<Scope> newScope)
|
|
{
|
|
LUAU_ASSERT(get<FreeType>(ty) || get<TableType>(ty) || get<FunctionType>(ty));
|
|
|
|
PendingType* newTy = queue(ty);
|
|
if (FreeType* ftv = Luau::getMutable<FreeType>(newTy))
|
|
{
|
|
ftv->scope = newScope;
|
|
}
|
|
else if (TableType* ttv = Luau::getMutable<TableType>(newTy))
|
|
{
|
|
LUAU_ASSERT(ttv->state == TableState::Free || ttv->state == TableState::Generic);
|
|
ttv->scope = newScope;
|
|
}
|
|
else if (FunctionType* ftv = Luau::getMutable<FunctionType>(newTy))
|
|
{
|
|
ftv->scope = newScope;
|
|
}
|
|
|
|
return newTy;
|
|
}
|
|
|
|
PendingTypePack* TxnLog::changeScope(TypePackId tp, NotNull<Scope> newScope)
|
|
{
|
|
LUAU_ASSERT(get<FreeTypePack>(tp));
|
|
|
|
PendingTypePack* newTp = queue(tp);
|
|
if (FreeTypePack* ftp = Luau::getMutable<FreeTypePack>(newTp))
|
|
{
|
|
ftp->scope = newScope;
|
|
}
|
|
|
|
return newTp;
|
|
}
|
|
|
|
PendingType* TxnLog::changeIndexer(TypeId ty, std::optional<TableIndexer> indexer)
|
|
{
|
|
LUAU_ASSERT(get<TableType>(ty));
|
|
|
|
PendingType* newTy = queue(ty);
|
|
if (TableType* ttv = Luau::getMutable<TableType>(newTy))
|
|
{
|
|
ttv->indexer = indexer;
|
|
}
|
|
|
|
return newTy;
|
|
}
|
|
|
|
std::optional<TypeLevel> TxnLog::getLevel(TypeId ty) const
|
|
{
|
|
if (FreeType* ftv = getMutable<FreeType>(ty))
|
|
return ftv->level;
|
|
else if (TableType* ttv = getMutable<TableType>(ty); ttv && (ttv->state == TableState::Free || ttv->state == TableState::Generic))
|
|
return ttv->level;
|
|
else if (FunctionType* ftv = getMutable<FunctionType>(ty))
|
|
return ftv->level;
|
|
|
|
return std::nullopt;
|
|
}
|
|
|
|
TypeId TxnLog::follow(TypeId ty) const
|
|
{
|
|
return Luau::follow(ty, this, [](const void* ctx, TypeId ty) -> TypeId {
|
|
const TxnLog* self = static_cast<const TxnLog*>(ctx);
|
|
PendingType* state = self->pending(ty);
|
|
|
|
if (state == nullptr)
|
|
return ty;
|
|
|
|
// Ugly: Fabricate a TypeId that doesn't adhere to most of the invariants
|
|
// that normally apply. This is safe because follow will only call get<>
|
|
// on the returned pointer.
|
|
return const_cast<const Type*>(&state->pending);
|
|
});
|
|
}
|
|
|
|
TypePackId TxnLog::follow(TypePackId tp) const
|
|
{
|
|
return Luau::follow(tp, this, [](const void* ctx, TypePackId tp) -> TypePackId {
|
|
const TxnLog* self = static_cast<const TxnLog*>(ctx);
|
|
PendingTypePack* state = self->pending(tp);
|
|
|
|
if (state == nullptr)
|
|
return tp;
|
|
|
|
// Ugly: Fabricate a TypePackId that doesn't adhere to most of the
|
|
// invariants that normally apply. This is safe because follow will
|
|
// only call get<> on the returned pointer.
|
|
return const_cast<const TypePackVar*>(&state->pending);
|
|
});
|
|
}
|
|
|
|
std::pair<std::vector<TypeId>, std::vector<TypePackId>> TxnLog::getChanges() const
|
|
{
|
|
std::pair<std::vector<TypeId>, std::vector<TypePackId>> result;
|
|
|
|
for (const auto& [typeId, _newState] : typeVarChanges)
|
|
result.first.push_back(typeId);
|
|
for (const auto& [typePackId, _newState] : typePackChanges)
|
|
result.second.push_back(typePackId);
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace Luau
|