Update to jdk-20+17

loongson-jvm · web-flow · commit b85db91e32c3 · 2022-10-12T14:34:16.000+08:00
28197: LA port of 8294190: Incorrect check messages in SharedRuntime::generate_uncommon_trap_blob
diff --git a/src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp b/src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp
@@ -2319,7 +2319,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
     __ ld_d(AT, unroll, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes());
     __ li(T4, Deoptimization::Unpack_uncommon_trap);
     __ beq(AT, T4, L);
-    __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");
+    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
     __ bind(L);
   }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2319,7 +2319,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {`
`2319`	`2319`	`__ ld_d(AT, unroll, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes());`
`2320`	`2320`	`__ li(T4, Deoptimization::Unpack_uncommon_trap);`
`2321`	`2321`	`__ beq(AT, T4, L);`
`2322`		`- __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");`
	`2322`	`+ __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");`
`2323`	`2323`	`__ bind(L);`
`2324`	`2324`	`}`
`2325`	`2325`	`#endif`