--- a/hotspot/src/share/vm/interpreter/oopMapCache.cpp	Tue Apr 27 18:13:47 2010 -0700
+++ b/hotspot/src/share/vm/interpreter/oopMapCache.cpp	Sun Oct 11 16:19:25 2009 -0700
@@ -224,8 +224,8 @@
   // If we are doing mark sweep _method may not have a valid header
   // $$$ This used to happen only for m/s collections; we might want to
   // think of an appropriate generalization of this distinction.
-  guarantee(Universe::heap()->is_gc_active() ||
-            _method->is_oop_or_null(), "invalid oop in oopMapCache")
+  guarantee(Universe::heap()->is_gc_active() || _method->is_oop_or_null(),
+            "invalid oop in oopMapCache");
 }
 
 #ifdef ENABLE_ZAP_DEAD_LOCALS