summaryrefslogtreecommitdiff
path: root/flang-rt/lib/runtime/type-info.cpp
diff options
context:
space:
mode:
authorPeter Klausler <pklausler@nvidia.com>2025-06-11 07:55:06 -0700
committerGitHub <noreply@github.com>2025-06-11 07:55:06 -0700
commit10f512f7bbda076ca2a0f9e3fcb2e7be0cb07199 (patch)
tree3ccfcda5451d8bfbb21faed26687e9403b794033 /flang-rt/lib/runtime/type-info.cpp
parent4e441665cc0d1585c8c6e44cf3c71a055f597d2e (diff)
Revert runtime work queue patch, it breaks some tests that need investigation (#143713)
Revert "[flang][runtime] Another try to fix build failure" This reverts commit 13869cac2b5051e453aa96ad71220d9d33404620. Revert "[flang][runtime] Fix build bot flang-runtime-cuda-gcc errors (#143650)" This reverts commit d75e28477af0baa063a4d4cc7b3cf657cfadd758. Revert "[flang][runtime] Replace recursion with iterative work queue (#137727)" This reverts commit 163c67ad3d1bf7af6590930d8f18700d65ad4564.
Diffstat (limited to 'flang-rt/lib/runtime/type-info.cpp')
-rw-r--r--flang-rt/lib/runtime/type-info.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/flang-rt/lib/runtime/type-info.cpp b/flang-rt/lib/runtime/type-info.cpp
index 451213202ace..82182696d70c 100644
--- a/flang-rt/lib/runtime/type-info.cpp
+++ b/flang-rt/lib/runtime/type-info.cpp
@@ -140,11 +140,11 @@ 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_};
if (subscripts) {
- offset += container.SubscriptsToByteOffset(subscripts);
+ descriptor.set_base_addr(container.Element<char>(subscripts) + offset_);
+ } else {
+ descriptor.set_base_addr(container.OffsetElement<char>() + offset_);
}
- descriptor.set_base_addr(container.OffsetElement<char>() + offset);
descriptor.raw().attribute = CFI_attribute_pointer;
}