diff src/share/vm/code/nmethod.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 738023c641c2
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/code/nmethod.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -1882,6 +1882,7 @@
 #endif
 }
 
+
 // Iterate over metadata calling this function.   Used by RedefineClasses
 void nmethod::metadata_do(void f(Metadata*)) {
   address low_boundary = verified_entry_point();
@@ -2508,7 +2509,6 @@
     MutexLocker ml_verify (CompiledIC_lock);
     ic = CompiledIC_at(this, call_site);
   }
-
   PcDesc* pd = pc_desc_at(ic->end_of_call());
   assert(pd != NULL, "PcDesc must exist");
   for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),