--- a/hotspot/src/share/vm/oops/oop.hpp	Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/oops/oop.hpp	Wed Aug 23 14:52:55 2017 -0400
@@ -287,9 +287,9 @@
   inline bool is_unlocked() const;
   inline bool has_bias_pattern() const;
 
-  // asserts
-  inline bool is_oop(bool ignore_mark_word = false) const;
-  inline bool is_oop_or_null(bool ignore_mark_word = false) const;
+  // asserts and guarantees
+  static bool is_oop(oop obj, bool ignore_mark_word = false);
+  static bool is_oop_or_null(oop obj, bool ignore_mark_word = false);
 #ifndef PRODUCT
   inline bool is_unlocked_oop() const;
 #endif