fix compilation and issue with parameter evaluation ordering

tschatzl · Jan 17, 2024 · 7a10242 · 7a10242
1 parent e60ce68
commit 7a10242
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hotspot/share/gc/g1/g1RegionPinCache.cpp b/src/hotspot/share/gc/g1/g1RegionPinCache.cpp
@@ -25,7 +25,8 @@
 #include "precompiled.hpp"
 
 #include "gc/g1/g1RegionPinCache.hpp"
-#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
 
 G1RegionPinCache::~G1RegionPinCache() {
   if (_count != 0) {

diff --git a/src/hotspot/share/gc/g1/g1RegionPinCache.hpp b/src/hotspot/share/gc/g1/g1RegionPinCache.hpp
@@ -51,8 +51,7 @@ class G1RegionPinCache : public StackObj {
   }
 
   Pair<uint, size_t> get_and_reset() {
-    Pair<uint, size_t> result(_region_idx, get_and_set(0, 0));
-    return result;
+    return Pair<uint, size_t> { _region_idx, get_and_set(0, 0) };
   }
 };