--- a/src/share/vm/graal/graalCompilerToVM.cpp	Tue Apr 28 17:08:47 2015 -0700
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Tue Apr 28 17:21:33 2015 -0700
@@ -509,7 +509,12 @@
         HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size());
       }
       nmethod* nm = cb->as_nmethod_or_null();
-      assert(nm == NULL || !installed_code_handle->is_scavengable() || nm->on_scavenge_root_list(), "nm should be scavengable if installed_code is scavengable");
+      if (nm != NULL && installed_code_handle->is_scavengable()) {
+        assert(nm->detect_scavenge_root_oops(), "nm should be scavengable if installed_code is scavengable");
+        if (!UseG1GC) {
+          assert(nm->on_scavenge_root_list(), "nm should be on scavengable list");
+        }
+      }
     }
   }
   return result;