Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ temp
# CMake build directories
build/
build_clang/
build-clang/
install_test/
cmake-build-*/
coverage_html/
Expand Down
28 changes: 14 additions & 14 deletions src/objects/lobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -933,24 +933,24 @@ class ProtoDebugInfo {

/* Phase 112: std::span accessors for debug info arrays */
inline std::span<ls_byte> getLineInfoSpan() noexcept {
return std::span(lineinfo, sizelineinfo);
return std::span(lineinfo, static_cast<size_t>(sizelineinfo));
}
inline std::span<const ls_byte> getLineInfoSpan() const noexcept {
return std::span(lineinfo, sizelineinfo);
return std::span(lineinfo, static_cast<size_t>(sizelineinfo));
}

inline std::span<AbsLineInfo> getAbsLineInfoSpan() noexcept {
return std::span(abslineinfo, sizeabslineinfo);
return std::span(abslineinfo, static_cast<size_t>(sizeabslineinfo));
}
inline std::span<const AbsLineInfo> getAbsLineInfoSpan() const noexcept {
return std::span(abslineinfo, sizeabslineinfo);
return std::span(abslineinfo, static_cast<size_t>(sizeabslineinfo));
}

inline std::span<LocVar> getLocVarsSpan() noexcept {
return std::span(locvars, sizelocvars);
return std::span(locvars, static_cast<size_t>(sizelocvars));
}
inline std::span<const LocVar> getLocVarsSpan() const noexcept {
return std::span(locvars, sizelocvars);
return std::span(locvars, static_cast<size_t>(sizelocvars));
}
};

Expand Down Expand Up @@ -1034,31 +1034,31 @@ class Proto : public GCBase<Proto> {

/* Phase 112: std::span accessors for arrays */
inline std::span<Instruction> getCodeSpan() noexcept {
return std::span(code, sizecode);
return std::span(code, static_cast<size_t>(sizecode));
}
inline std::span<const Instruction> getCodeSpan() const noexcept {
return std::span(code, sizecode);
return std::span(code, static_cast<size_t>(sizecode));
}

inline std::span<TValue> getConstantsSpan() noexcept {
return std::span(k, sizek);
return std::span(k, static_cast<size_t>(sizek));
}
inline std::span<const TValue> getConstantsSpan() const noexcept {
return std::span(k, sizek);
return std::span(k, static_cast<size_t>(sizek));
}

inline std::span<Proto*> getProtosSpan() noexcept {
return std::span(p, sizep);
return std::span(p, static_cast<size_t>(sizep));
}
inline std::span<Proto* const> getProtosSpan() const noexcept {
return std::span(p, sizep);
return std::span(p, static_cast<size_t>(sizep));
}

inline std::span<Upvaldesc> getUpvaluesSpan() noexcept {
return std::span(upvalues, sizeupvalues);
return std::span(upvalues, static_cast<size_t>(sizeupvalues));
}
inline std::span<const Upvaldesc> getUpvaluesSpan() const noexcept {
return std::span(upvalues, sizeupvalues);
return std::span(upvalues, static_cast<size_t>(sizeupvalues));
}

inline Proto** getProtos() const noexcept { return p; }
Expand Down
4 changes: 2 additions & 2 deletions src/serialization/ldump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ static void dumpDebug (DumpState *D, const Proto *f) {
auto locvars = f->getDebugInfo().getLocVarsSpan();
n = (D->strip) ? 0 : static_cast<int>(locvars.size());
dumpInt(D, n);
for (const auto& lv : locvars.subspan(0, n)) {
for (const auto& lv : locvars.subspan(0, static_cast<size_t>(n))) {
dumpString(D, lv.getVarName());
dumpInt(D, lv.getStartPC());
dumpInt(D, lv.getEndPC());
}
auto upvalues = f->getUpvaluesSpan();
n = (D->strip) ? 0 : static_cast<int>(upvalues.size());
dumpInt(D, n);
for (const auto& uv : upvalues.subspan(0, n)) {
for (const auto& uv : upvalues.subspan(0, static_cast<size_t>(n))) {
dumpString(D, uv.getName());
}
}
Expand Down
Loading