From: OpenJDK Team <openjdk-21@packages.debian.org>
Date: Sat, 15 Mar 2025 07:27:31 +0000 (+0100)
Subject: Misalign address in the test rather than structure
X-Git-Tag: archive/raspbian/21.0.7_7ea-1+rpi1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eda70407114fea38a5e4bfb18a039c7b454a4421;p=openjdk-21.git

Misalign address in the test rather than structure

mk68-support.diff aligned metaspace structures by 4 bytes breaking the test.
Add 1 to address type rather than aligned structure to produce misaligned pointer.

Gbp-Pq: Name misalign-pointer-for-armhf.patch
---

diff --git a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
index 820ad1fd3..c4b36e608 100644
--- a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
+++ b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
@@ -61,7 +61,7 @@ public:
     ASSERT_TRUE(MetaspaceObj::is_valid(p));
 
     // A misaligned object shall not be recognized
-    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p) + 1;
+    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p + 1);
     ASSERT_FALSE(MetaspaceObj::is_valid(p_misaligned));
 
     // Test VirtualSpaceList::contains
@@ -72,7 +72,7 @@ public:
     ASSERT_TRUE(vslist->contains((MetaWord*)p));
 
     // A misaligned pointer shall still be recognized by list::contains
-    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p) + 1));
+    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p + 1)));
 
     // Now for some bogus values
     ASSERT_FALSE(MetaspaceObj::is_valid((MetaspaceObj*)NULL));