--- a/src/share/vm/code/oopRecorder.hpp	Wed Oct 08 11:46:00 2014 -0700
+++ b/src/share/vm/code/oopRecorder.hpp	Wed Oct 08 11:48:00 2014 -0700
@@ -153,11 +153,15 @@
  public:
   OopRecorder(Arena* arena = NULL): _oops(arena), _metadata(arena) {}
 
+  void check_for_duplicates(int index, jobject h) NOT_DEBUG_RETURN;
+
   int allocate_oop_index(jobject h) {
     return _oops.allocate_index(h);
   }
   int find_index(jobject h) {
-    return _oops.find_index(h);
+    int result = _oops.find_index(h);
+    check_for_duplicates(result, h);
+    return result;
   }
   jobject oop_at(int index) {
     return _oops.at(index);