--- a/src/share/vm/oops/klass.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/oops/klass.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -376,6 +376,8 @@
 }
 
 bool Klass::is_loader_alive(BoolObjectClosure* is_alive) {
+  assert(ClassLoaderDataGraph::contains((address)this), "is in the metaspace");
+
 #ifdef ASSERT
   // The class is alive iff the class loader is alive.
   oop loader = class_loader();
@@ -638,7 +640,7 @@
 
 // Verification
 
-void Klass::verify_on(outputStream* st) {
+void Klass::verify_on(outputStream* st, bool check_dictionary) {
 
   // This can be expensive, but it is worth checking that this klass is actually
   // in the CLD graph but not in production.
@@ -692,21 +694,3 @@
 }
 
 #endif
-
-/////////////// Unit tests ///////////////
-
-#ifndef PRODUCT
-
-class TestKlass {
- public:
-  static void test_oop_is_instanceClassLoader() {
-    assert(SystemDictionary::ClassLoader_klass()->oop_is_instanceClassLoader(), "assert");
-    assert(!SystemDictionary::String_klass()->oop_is_instanceClassLoader(), "assert");
-  }
-};
-
-void TestKlass_test() {
-  TestKlass::test_oop_is_instanceClassLoader();
-}
-
-#endif