Skip to content

Fix the type of offset that broke 32-bit flang-rt build to use uint64_t consistently #147359

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 8, 2025
Merged

Fix the type of offset that broke 32-bit flang-rt build to use uint64_t consistently #147359

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebe26d2
Fix the type of offset that broke 32-bit flang-rt build.
DanielCChen Jul 7, 2025
afb7f4f
To address review comment to use 'static_cast<size_t>()'.
DanielCChen Jul 7, 2025
d36b3c0
To address review comment to use 'static_cast<std::size_t>()'.
DanielCChen Jul 7, 2025
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: 2 additions & 2 deletions flang-rt/lib/runtime/assign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ RT_API_ATTRS int DerivedAssignTicket<IS_COMPONENTWISE>::Continue(
std::size_t componentByteSize{
this->component_->SizeInBytes(this->instance_)};
if (IS_COMPONENTWISE && toIsContiguous_ && fromIsContiguous_) {
std::size_t offset{this->component_->offset()};
std::size_t offset{static_cast<size_t>(this->component_->offset())};
char *to{this->instance_.template OffsetElement<char>(offset)};
const char *from{
this->from_->template OffsetElement<const char>(offset)};
Expand Down Expand Up @@ -630,7 +630,7 @@ RT_API_ATTRS int DerivedAssignTicket<IS_COMPONENTWISE>::Continue(
std::size_t componentByteSize{
this->component_->SizeInBytes(this->instance_)};
if (IS_COMPONENTWISE && toIsContiguous_ && fromIsContiguous_) {
std::size_t offset{this->component_->offset()};
std::uint64_t offset{static_cast<size_t>(this->component_->offset())};
char *to{this->instance_.template OffsetElement<char>(offset)};
const char *from{
this->from_->template OffsetElement<const char>(offset)};
Expand Down
2 changes: 1 addition & 1 deletion flang-rt/lib/runtime/type-info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ RT_API_ATTRS void Component::CreatePointerDescriptor(Descriptor &descriptor,
const SubscriptValue *subscripts) const {
RUNTIME_CHECK(terminator, genre_ == Genre::Data);
EstablishDescriptor(descriptor, container, terminator);
std::size_t offset{offset_};
std::size_t offset{static_cast<size_t>(offset_)};
if (subscripts) {
offset += container.SubscriptsToByteOffset(subscripts);
}
Expand Down
Loading