diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 05d30649887..491346b450d 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -199,9 +199,9 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
 	  if (check_typedef (v0->type ())->length ()
 	      != check_typedef (v1->type ())->length ())
 	    break;
-	  if (!value_contents_eq (v0, v0->embedded_offset (),
-				  v1, v1->embedded_offset (),
-				  check_typedef (v0->type ())->length ()))
+	  if (!v0->contents_eq (v0->embedded_offset (),
+				v1, v1->embedded_offset (),
+				check_typedef (v0->type ())->length ()))
 	    break;
 	}
 
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 9d0f02af954..8d4177f3243 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -263,8 +263,8 @@ class fortran_array_printer_impl : public fortran_array_walker_base_impl
     LONGEST elt_off_prev = m_elt_off_prev;
     bool repeated = (m_options->repeat_count_threshold < UINT_MAX
 		     && elt_type_prev != nullptr
-		     && value_contents_eq (m_val, elt_off_prev, m_val, elt_off,
-					   elt_type->length ()));
+		     && m_val->contents_eq (elt_off_prev, m_val, elt_off,
+					    elt_type->length ()));
 
     if (repeated)
       m_nrepeats++;
@@ -362,8 +362,8 @@ class fortran_array_printer_impl : public fortran_array_walker_base_impl
 	return true;
       }
     else
-      return value_contents_eq (val, offset1, val, offset2,
-				type->length ());
+      return val->contents_eq (offset1, val, offset2,
+			       type->length ());
   }
 
   /* The number of elements printed so far.  */
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 609872455ff..f2e680cb0d3 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -983,8 +983,8 @@ register_changed_p (int regnum, readonly_detached_regcache *prev_regs,
   gdb_assert (prev_value != NULL);
   gdb_assert (this_value != NULL);
 
-  auto ret = !value_contents_eq (prev_value, 0, this_value, 0,
-				 register_size (gdbarch, regnum));
+  auto ret = !prev_value->contents_eq (0, this_value, 0,
+				       register_size (gdbarch, regnum));
 
   release_value (prev_value);
   release_value (this_value);
diff --git a/gdb/stack.c b/gdb/stack.c
index 983c99e5860..cd5e391debe 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -585,7 +585,7 @@ read_frame_arg (const frame_print_options &fp_opts,
 	      if (entryval->lazy ())
 		entryval->fetch_lazy ();
 
-	      if (value_contents_eq (val, 0, entryval, 0, type->length ()))
+	      if (val->contents_eq (0, entryval, 0, type->length ()))
 		{
 		  /* Initialize it just to avoid a GCC false warning.  */
 		  struct value *val_deref = NULL, *entryval_deref;
@@ -610,9 +610,9 @@ read_frame_arg (const frame_print_options &fp_opts,
 		      /* If the reference addresses match but dereferenced
 			 content does not match print them.  */
 		      if (val != val_deref
-			  && value_contents_eq (val_deref, 0,
-						entryval_deref, 0,
-						type_deref->length ()))
+			  && val_deref->contents_eq (0,
+						     entryval_deref, 0,
+						     type_deref->length ()))
 			val_equal = 1;
 		    }
 		  catch (const gdb_exception_error &except)
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 8b565955e1c..decaaa2710c 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -2024,7 +2024,7 @@ value_print_array_elements (struct value *val, struct ui_file *stream,
 		= value_from_component_bitsize (val, elttype,
 						rep1 * bit_stride,
 						bit_stride);
-	      if (!value_contents_eq (element, rep_elt))
+	      if (!element->contents_eq (rep_elt))
 		break;
 	      ++reps;
 	      ++rep1;
diff --git a/gdb/value.c b/gdb/value.c
index fcc5481c20a..c3fa00a33da 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -633,29 +633,28 @@ find_first_range_overlap_and_match (struct ranges_and_idx *rp1,
    with LENGTH bits of VAL2's contents starting at OFFSET2 bits.
    Return true if the available bits match.  */
 
-static bool
-value_contents_bits_eq (const struct value *val1, int offset1,
-			const struct value *val2, int offset2,
-			int length)
+bool
+value::contents_bits_eq (int offset1, const struct value *val2, int offset2,
+			 int length) const
 {
   /* Each array element corresponds to a ranges source (unavailable,
      optimized out).  '1' is for VAL1, '2' for VAL2.  */
   struct ranges_and_idx rp1[2], rp2[2];
 
   /* See function description in value.h.  */
-  gdb_assert (!val1->m_lazy && !val2->m_lazy);
+  gdb_assert (!m_lazy && !val2->m_lazy);
 
   /* We shouldn't be trying to compare past the end of the values.  */
   gdb_assert (offset1 + length
-	      <= val1->m_enclosing_type->length () * TARGET_CHAR_BIT);
+	      <= m_enclosing_type->length () * TARGET_CHAR_BIT);
   gdb_assert (offset2 + length
 	      <= val2->m_enclosing_type->length () * TARGET_CHAR_BIT);
 
   memset (&rp1, 0, sizeof (rp1));
   memset (&rp2, 0, sizeof (rp2));
-  rp1[0].ranges = &val1->m_unavailable;
+  rp1[0].ranges = &m_unavailable;
   rp2[0].ranges = &val2->m_unavailable;
-  rp1[1].ranges = &val1->m_optimized_out;
+  rp1[1].ranges = &m_optimized_out;
   rp2[1].ranges = &val2->m_optimized_out;
 
   while (length > 0)
@@ -683,7 +682,7 @@ value_contents_bits_eq (const struct value *val1, int offset1,
 	}
 
       /* Compare the available/valid contents.  */
-      if (memcmp_with_bit_offsets (val1->m_contents.get (), offset1,
+      if (memcmp_with_bit_offsets (m_contents.get (), offset1,
 				   val2->m_contents.get (), offset2, l) != 0)
 	return false;
 
@@ -695,26 +694,28 @@ value_contents_bits_eq (const struct value *val1, int offset1,
   return true;
 }
 
+/* See value.h.  */
+
 bool
-value_contents_eq (const struct value *val1, LONGEST offset1,
-		   const struct value *val2, LONGEST offset2,
-		   LONGEST length)
+value::contents_eq (LONGEST offset1,
+		    const struct value *val2, LONGEST offset2,
+		    LONGEST length) const
 {
-  return value_contents_bits_eq (val1, offset1 * TARGET_CHAR_BIT,
-				 val2, offset2 * TARGET_CHAR_BIT,
-				 length * TARGET_CHAR_BIT);
+  return contents_bits_eq (offset1 * TARGET_CHAR_BIT,
+			   val2, offset2 * TARGET_CHAR_BIT,
+			   length * TARGET_CHAR_BIT);
 }
 
 /* See value.h.  */
 
 bool
-value_contents_eq (const struct value *val1, const struct value *val2)
+value::contents_eq (const struct value *val2) const
 {
-  ULONGEST len1 = check_typedef (val1->enclosing_type ())->length ();
+  ULONGEST len1 = check_typedef (enclosing_type ())->length ();
   ULONGEST len2 = check_typedef (val2->enclosing_type ())->length ();
   if (len1 != len2)
     return false;
-  return value_contents_eq (val1, 0, val2, 0, len1);
+  return contents_eq (0, val2, 0, len1);
 }
 
 /* The value-history records all the values printed by print commands
diff --git a/gdb/value.h b/gdb/value.h
index 46d3a49c669..162d554e6ff 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -394,6 +394,66 @@ struct value
      it.  */
   void fetch_lazy ();
 
+  /* Compare LENGTH bytes of this value's contents starting at OFFSET1
+     with LENGTH bytes of VAL2's contents starting at OFFSET2.
+
+     Note that "contents" refers to the whole value's contents
+     (value_contents_all), without any embedded offset adjustment.  For
+     example, to compare a complete object value with itself, including
+     its enclosing type chunk, you'd do:
+
+     int len = check_typedef (val->enclosing_type ())->length ();
+     val->contents_eq (0, val, 0, len);
+
+     Returns true iff the set of available/valid contents match.
+
+     Optimized-out contents are equal to optimized-out contents, and are
+     not equal to non-optimized-out contents.
+
+     Unavailable contents are equal to unavailable contents, and are not
+     equal to non-unavailable contents.
+
+     For example, if 'x's represent an unavailable byte, and 'V' and 'Z'
+     represent different available/valid bytes, in a value with length
+     16:
+
+     offset:   0   4   8   12  16
+     contents: xxxxVVVVxxxxVVZZ
+
+     then:
+
+     val->contents_eq(0, val, 8, 6) => true
+     val->contents_eq(0, val, 4, 4) => false
+     val->contents_eq(0, val, 8, 8) => false
+     val->contents_eq(4, val, 12, 2) => true
+     val->contents_eq(4, val, 12, 4) => true
+     val->contents_eq(3, val, 4, 4) => true
+
+     If 'x's represent an unavailable byte, 'o' represents an optimized
+     out byte, in a value with length 8:
+
+     offset:   0   4   8
+     contents: xxxxoooo
+
+     then:
+
+     val->contents_eq(0, val, 2, 2) => true
+     val->contents_eq(4, val, 6, 2) => true
+     val->contents_eq(0, val, 4, 4) => true
+
+     We only know whether a value chunk is unavailable or optimized out
+     if we've tried to read it.  As this routine is used by printing
+     routines, which may be printing values in the value history, long
+     after the inferior is gone, it works with const values.  Therefore,
+     this routine must not be called with lazy values.  */
+
+  bool contents_eq (LONGEST offset1, const struct value *val2, LONGEST offset2,
+		    LONGEST length) const;
+
+  /* An overload of contents_eq that compares the entirety of both
+     values.  */
+  bool contents_eq (const struct value *val2) const;
+
 
   /* Type of value; either not an lval, or one of the various
      different possible kinds of lval.  */
@@ -565,6 +625,15 @@ struct value
   /* Allocate the contents of this value if it has not been allocated
      yet.  */
   void allocate_contents ();
+
+  /* Helper function for value_contents_eq.  The only difference is that
+     this function is bit rather than byte based.
+
+     Compare LENGTH bits of this value's contents starting at OFFSET1
+     bits with LENGTH bits of VAL2's contents starting at OFFSET2
+     bits.  Return true if the available bits match.  */
+  bool contents_bits_eq (int offset1, const struct value *val2, int offset2,
+			 int length) const;
 };
 
 /* Returns value_type or value_enclosing_type depending on
@@ -799,69 +868,6 @@ extern void mark_value_bytes_unavailable (struct value *value,
 extern void mark_value_bits_unavailable (struct value *value,
 					 LONGEST offset, LONGEST length);
 
-/* Compare LENGTH bytes of VAL1's contents starting at OFFSET1 with
-   LENGTH bytes of VAL2's contents starting at OFFSET2.
-
-   Note that "contents" refers to the whole value's contents
-   (value_contents_all), without any embedded offset adjustment.  For
-   example, to compare a complete object value with itself, including
-   its enclosing type chunk, you'd do:
-
-   int len = check_typedef (val->enclosing_type ())->length ();
-     value_contents_eq (val, 0, val, 0, len);
-
-   Returns true iff the set of available/valid contents match.
-
-   Optimized-out contents are equal to optimized-out contents, and are
-   not equal to non-optimized-out contents.
-
-   Unavailable contents are equal to unavailable contents, and are not
-   equal to non-unavailable contents.
-
-   For example, if 'x's represent an unavailable byte, and 'V' and 'Z'
-   represent different available/valid bytes, in a value with length
-   16:
-
-     offset:   0   4   8   12  16
-     contents: xxxxVVVVxxxxVVZZ
-
-   then:
-
-     value_contents_eq(val, 0, val, 8, 6) => true
-     value_contents_eq(val, 0, val, 4, 4) => false
-     value_contents_eq(val, 0, val, 8, 8) => false
-     value_contents_eq(val, 4, val, 12, 2) => true
-     value_contents_eq(val, 4, val, 12, 4) => true
-     value_contents_eq(val, 3, val, 4, 4) => true
-
-   If 'x's represent an unavailable byte, 'o' represents an optimized
-   out byte, in a value with length 8:
-
-     offset:   0   4   8
-     contents: xxxxoooo
-
-   then:
-
-     value_contents_eq(val, 0, val, 2, 2) => true
-     value_contents_eq(val, 4, val, 6, 2) => true
-     value_contents_eq(val, 0, val, 4, 4) => true
-
-   We only know whether a value chunk is unavailable or optimized out
-   if we've tried to read it.  As this routine is used by printing
-   routines, which may be printing values in the value history, long
-   after the inferior is gone, it works with const values.  Therefore,
-   this routine must not be called with lazy values.  */
-
-extern bool value_contents_eq (const struct value *val1, LONGEST offset1,
-			       const struct value *val2, LONGEST offset2,
-			       LONGEST length);
-
-/* An overload of value_contents_eq that compares the entirety of both
-   values.  */
-
-extern bool value_contents_eq (const struct value *val1,
-			       const struct value *val2);
-
 /* Read LENGTH addressable memory units starting at MEMADDR into BUFFER,
    which is (or will be copied to) VAL's contents buffer offset by
    BIT_OFFSET bits.  Marks value contents ranges as unavailable if
