Mercurial > hg > truffle

diff src/share/vm/c1/c1_Compilation.cpp @ 2252:72d6c57d0658

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7017434: Tiered needs to support reprofiling Summary: Tiered needs to support proper method reprofiling after deopts. Reviewed-by: kvn
author iveresov
date Wed, 09 Feb 2011 16:34:34 -0800
parents 2f9d59b0fa5c
children c124e2e7463e
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Compilation.cpp	Tue Feb 08 16:12:16 2011 -0800
+++ b/src/share/vm/c1/c1_Compilation.cpp	Wed Feb 09 16:34:34 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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
@@ -491,10 +491,11 @@
       // to start profiling on its own.
       _method->ensure_method_data();
     }
-  } else if (is_profiling() && _would_profile) {
+  } else if (is_profiling()) {
     ciMethodData *md = method->method_data_or_null();
-    assert(md != NULL, "Sanity");
-    md->set_would_profile(_would_profile);
+    if (md != NULL) {
+      md->set_would_profile(_would_profile);
+    }
   }
 }