Review Martin

reinrich · Dec 23, 2023 · 904c233 · 904c233
1 parent 01af2d1
commit 904c233
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/hotspot/cpu/s390/nativeInst_s390.hpp b/src/hotspot/cpu/s390/nativeInst_s390.hpp
@@ -658,8 +658,8 @@ class NativePostCallNop: public NativeInstruction {
 public:
   bool check() const { Unimplemented(); return false; }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const { return false; }
-  bool patch(int32_t oopmap_slot, int32_t cb_offset) { Unimplemented() ; return false; }
-  void make_deopt();
+  bool patch(int32_t oopmap_slot, int32_t cb_offset) { Unimplemented(); return false; }
+  void make_deopt() { Unimplemented(); }
 };
 
 inline NativePostCallNop* nativePostCallNop_at(address address) {

diff --git a/src/hotspot/share/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp
@@ -105,18 +105,15 @@ inline CodeBlob* frame::get_cb() const {
 }
 
 inline const ImmutableOopMap* frame::get_oop_map() const {
-  if (_cb == nullptr) return nullptr;
-  if (_cb->oop_maps() != nullptr) {
-    NativePostCallNop* nop = nativePostCallNop_at(_pc);
-    int oopmap_slot;
-    int cb_offset;
-    if (nop != nullptr && nop->decode(oopmap_slot, cb_offset)) {
-      return _cb->oop_map_for_slot(oopmap_slot, _pc);
-    }
-    const ImmutableOopMap* oop_map = OopMapSet::find_map(this);
-    return oop_map;
+  if (_cb == nullptr || _cb->oop_maps() == nullptr) return nullptr;
+  NativePostCallNop* nop = nativePostCallNop_at(_pc);
+  int oopmap_slot;
+  int cb_offset;
+  if (nop != nullptr && nop->decode(oopmap_slot, cb_offset)) {
+    return _cb->oop_map_for_slot(oopmap_slot, _pc);
   }
-  return nullptr;
+  const ImmutableOopMap* oop_map = OopMapSet::find_map(this);
+  return oop_map;
 }
 
 inline int frame::interpreter_frame_monitor_size_in_bytes() {