8300830: Remove redundant assertion in src/hotspot/share/runtime/javaCalls.cpp

David Holmes · David Holmes · commit fbe5ab0066e2 · 2023-01-25T01:05:25.000Z
Reviewed-by: iklam, rehn, dcubed
diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -95,8 +95,6 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
   debug_only(_thread->inc_java_call_counter());
   _thread->set_active_handles(new_handles);     // install new handle block and reset Java frame linkage
 
-  assert (_thread->thread_state() != _thread_in_native, "cannot set native pc to NULL");
-
   MACOS_AARCH64_ONLY(_thread->enable_wx(WXExec));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* Copyright (c) 2021, Azul Systems, Inc. All rights reserved.`
`4`	`4`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`5`	`5`	`*`
`@@ -95,8 +95,6 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei`
`95`	`95`	`debug_only(_thread->inc_java_call_counter());`
`96`	`96`	`_thread->set_active_handles(new_handles); // install new handle block and reset Java frame linkage`
`97`	`97`
`98`		`- assert (_thread->thread_state() != _thread_in_native, "cannot set native pc to NULL");`
`99`		`-`
`100`	`98`	`MACOS_AARCH64_ONLY(_thread->enable_wx(WXExec));`
`101`	`99`	`}`
`102`	`100`