Skip to content

Commit a6e489a

Browse files
committed
[GR-68702] Adapt JDK-8364141: Remove LockingMode related code from x86
PullRequest: graal/21850
2 parents 4ed7774 + a41d1ec commit a6e489a

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,8 @@
197197
* appropriately to comply with the layouts above.
198198
*/
199199
// @formatter:off
200-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L457-L617",
201-
sha1 = "2d66e0ccf8dbf69f575be2633d5a17f77a20131d")
202-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L619-L780",
203-
sha1 = "e88d7b8c4bb85358c6a810ee1d7d92fde5db42e6")
200+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L149-L578",
201+
sha1 = "ee04c86e8b12a9f8331c5e79f95a17b27615c845")
204202
// @formatter:on
205203
public class MonitorSnippets implements Snippets {
206204

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BitSwapOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import jdk.vm.ci.meta.Value;
4141

4242
// @formatter:off
43-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L6477-L6559",
43+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L6275-L6357",
4444
sha1 = "34c6e1ee7916fc7190cbcbc237eaf2b510f7dd0e")
4545
// @formatter:on
4646
public final class AMD64BitSwapOp extends AMD64LIRInstruction {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import jdk.vm.ci.meta.Value;
5656

5757
// @formatter:off
58-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L4142-L4385",
58+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3940-L4183",
5959
sha1 = "1aa453c52215c1fc8d467460a93fa590f9edab15")
6060
// @formatter:on
6161
@Opcode("AMD64_COUNT_POSITIVES")

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@
7575
import jdk.vm.ci.meta.Value;
7676

7777
// @formatter:off
78-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1887-L1996",
78+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1685-L1794",
7979
sha1 = "1cc5a10b19e7746105493d8f430f628cc7f89c51")
80-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L2185-L2231",
80+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1983-L2029",
8181
sha1 = "9cbba8bd6c4037427fa46f067abb722b15aca90c")
82-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3562-L3749",
82+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3360-L3547",
8383
sha1 = "a3fe941a49e0e3f8443b2e16e550d6c94b012b12")
8484
// @formatter:on
8585
@Opcode("VECTORIZED_HASHCODE")

0 commit comments

Comments
 (0)