Merge remote-tracking branch 'lilliput/JEP-450-temporary-fix-branch-2…

…' into JDK-8305895-v4
rkennke · Sep 19, 2024 · 0d8a923 · 0d8a923
2 parents b25a4b6 + 945eb6f
commit 0d8a923
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
@@ -239,7 +239,7 @@ void CompressedKlassPointers::initialize(address addr, size_t len) {
 
   } else {
 
-    // Traditional (non-compact) header mode)
+    // Traditional (non-compact) header mode
     const uintptr_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
     const uintptr_t zerobased_max = nth_bit(narrow_klass_pointer_bits() + max_shift());
 

diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
@@ -259,4 +259,5 @@ class CompressedKlassPointers : public AllStatic {
   }
 
 };
+
 #endif // SHARE_OOPS_COMPRESSEDKLASS_HPP
diff --git a/test/hotspot/gtest/metaspace/test_clms.cpp b/test/hotspot/gtest/metaspace/test_clms.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -184,12 +184,8 @@ class ClmsTester {
           EXPECT_FREEBLOCKS_UNCHANGED(nca);
         }
         return bl;
-
-      } // end: is_class
-
-      else
-
-      {
+        // end: is_class
+      } else {
         // Nonclass arena allocation.
         // Allocation waste can happen:
         // - if we allocate from nonclass freeblocks, the block remainder