Mercurial > hg > truffle
diff src/share/vm/c1/c1_Compilation.cpp @ 2260:850b2295a494
Merge
author | kvn |
---|---|
date | Mon, 14 Feb 2011 14:36:29 -0800 |
parents | 72d6c57d0658 |
children | c124e2e7463e |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Compilation.cpp Fri Feb 11 15:32:03 2011 -0800 +++ b/src/share/vm/c1/c1_Compilation.cpp Mon Feb 14 14:36:29 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); + } } }