Update (2025.01.09, 4th)

35420: LA port of 8340313: Crash due to invalid oop in nmethod after C1 patching
35419: LA port of 8329597: C2: Intrinsify Reference.clear
35418: LA port of 8341784: Refactor TypeVect to use a BasicType instead of a const Type*
35417: LA port of 8341619: C2: remove unused StoreCM node

src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2024, Loongson Technology. All rights reserved.
+ * Copyright (c) 2021, 2025, Loongson Technology. 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
@@ -1135,6 +1135,8 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
       __ MacroAssembler::call_VM_leaf_base(ZBarrierSetRuntime::store_barrier_on_native_oop_field_without_healing_addr(), 1);
     } else if (stub->is_atomic()) {
       __ MacroAssembler::call_VM_leaf_base(ZBarrierSetRuntime::store_barrier_on_oop_field_with_healing_addr(), 1);
+    } else if (stub->is_nokeepalive()) {
+      __ MacroAssembler::call_VM_leaf_base(ZBarrierSetRuntime::no_keepalive_store_barrier_on_oop_field_without_healing_addr(), 1);
     } else {
       __ MacroAssembler::call_VM_leaf_base(ZBarrierSetRuntime::store_barrier_on_oop_field_without_healing_addr(), 1);
     }

src/hotspot/cpu/loongarch/gc/z/z_loongarch_64.ad

@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2021, 2024, Loongson Technology. All rights reserved.
+// Copyright (c) 2021, 2025, Loongson Technology. 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
@@ -59,7 +59,8 @@ static void z_store_barrier(MacroAssembler* masm, const MachNode* node, Address
     __ z_color(rnew_zpointer, rnew_zaddress, tmp);
   } else {
     bool is_native = (node->barrier_data() & ZBarrierNative) != 0;
-    ZStoreBarrierStubC2* const stub = ZStoreBarrierStubC2::create(node, ref_addr, rnew_zaddress, rnew_zpointer, is_native, is_atomic);
+    bool is_nokeepalive = (node->barrier_data() & ZBarrierNoKeepalive) != 0;
+    ZStoreBarrierStubC2* const stub = ZStoreBarrierStubC2::create(node, ref_addr, rnew_zaddress, rnew_zpointer, is_native, is_atomic, is_nokeepalive);
     ZBarrierSetAssembler* bs_asm = ZBarrierSet::assembler();
     bs_asm->store_barrier_fast(masm, ref_addr, rnew_zaddress, rnew_zpointer, tmp, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
   }

src/hotspot/cpu/loongarch/loongarch_64.ad

@@ -1144,10 +1144,6 @@ const RegMask* Matcher::predicate_reg_mask(void) {
   return nullptr;
 }
 
-const TypeVectMask* Matcher::predicate_reg_type(const Type* elemTy, int length) {
-  return nullptr;
-}
-
 int Matcher::scalable_vector_reg_size(const BasicType bt) {
   return -1;
 }
@@ -11136,18 +11132,6 @@ instruct cmpFastUnlockLightweight(FlagsReg cr, no_CR_mRegP object, no_CR_mRegP b
   ins_pipe( pipe_slow );
 %}
 
-// Store card-mark Immediate 0
-instruct storeImmCM(memory mem, immI_0 zero) %{
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(150);
-  format %{ "st_b $mem, zero\t! card-mark imm0" %}
-  ins_encode %{
-    __ loadstore_enc(R0, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp, C2_MacroAssembler::STORE_BYTE);
-  %}
-  ins_pipe( pipe_serial );
-%}
-
 // Die now
 instruct ShouldNotReachHere( )
 %{

src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2024, Loongson Technology. All rights reserved.
+ * Copyright (c) 2015, 2025, Loongson Technology. 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
@@ -126,7 +126,7 @@ address NativeCall::destination() const {
 // during code generation, where no patching lock is needed.
 void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
   assert(!assert_lock ||
-         (Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
+         (CodeCache_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
          CompiledICLocker::is_safe(addr_at(0)),
          "concurrent code patching");