Merge pull request #19465 from mpirvu/forloopfix

ymanton · web-flow · commit c58b9f8b1051 · 2024-05-08T13:35:57.000-04:00
Change "for" loop from range-based to iterator based
diff --git a/runtime/compiler/env/PersistentAllocator.cpp b/runtime/compiler/env/PersistentAllocator.cpp
@@ -707,8 +707,9 @@ PersistentAllocator::disclaimAllSegments()
    TR::CompilationInfo *compInfo = TR::CompilationInfo::get(_javaVM.jitConfig);
    bool canDisclaimOnSwap = TR::Options::getCmdLineOptions()->getOption(TR_DisclaimMemoryOnSwap) && !compInfo->isSwapMemoryDisabled();
    j9thread_monitor_enter(_segmentMonitor);
-   for (const J9MemorySegment &segment : _segments)
+   for (auto segmentIterator = _segments.begin(); segmentIterator != _segments.end(); ++segmentIterator)
       {
+      J9MemorySegment &segment = *segmentIterator;
       if (segment.vmemIdentifier.allocator == OMRPORT_VMEM_RESERVE_USED_MMAP_SHM || // Can disclaim to file
         ((segment.vmemIdentifier.mode & J9PORT_VMEM_MEMORY_MODE_VIRTUAL) && canDisclaimOnSwap)) // Can disclaim to swap
          {

Original file line number	Diff line number	Diff line change
`@@ -707,8 +707,9 @@ PersistentAllocator::disclaimAllSegments()`
`707`	`707`	`TR::CompilationInfo *compInfo = TR::CompilationInfo::get(_javaVM.jitConfig);`
`708`	`708`	`bool canDisclaimOnSwap = TR::Options::getCmdLineOptions()->getOption(TR_DisclaimMemoryOnSwap) && !compInfo->isSwapMemoryDisabled();`
`709`	`709`	`j9thread_monitor_enter(_segmentMonitor);`
`710`		`- for (const J9MemorySegment &segment : _segments)`
	`710`	`+ for (auto segmentIterator = _segments.begin(); segmentIterator != _segments.end(); ++segmentIterator)`
`711`	`711`	`{`
	`712`	`+ J9MemorySegment &segment = *segmentIterator;`
`712`	`713`	`if (segment.vmemIdentifier.allocator == OMRPORT_VMEM_RESERVE_USED_MMAP_SHM \|\| // Can disclaim to file`
`713`	`714`	`((segment.vmemIdentifier.mode & J9PORT_VMEM_MEMORY_MODE_VIRTUAL) && canDisclaimOnSwap)) // Can disclaim to swap`
`714`	`715`	`{`