Mercurial > hg > truffle
diff src/share/vm/compiler/compileBroker.cpp @ 2187:986b2844f7a2
6789220: CMS: intermittent timeout running nsk/regression/b4796926
Summary: The reference handler java thread and the GC could dead lock
Reviewed-by: never, johnc, jcoomes
author | brutisso |
---|---|
date | Tue, 01 Feb 2011 14:05:46 +0100 |
parents | 3582bf76420e |
children | 0cd39a385a72 850b2295a494 |
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp Tue Feb 01 10:02:01 2011 -0800 +++ b/src/share/vm/compiler/compileBroker.cpp Tue Feb 01 14:05:46 2011 +0100 @@ -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 @@ -1210,7 +1210,17 @@ // Should the current thread be blocked until this compilation request // has been fulfilled? bool CompileBroker::is_compile_blocking(methodHandle method, int osr_bci) { - return !BackgroundCompilation; + if (!BackgroundCompilation) { + Symbol* class_name = method->method_holder()->klass_part()->name(); + if (class_name->starts_with("java/lang/ref/Reference", 23)) { + // The reference handler thread can dead lock with the GC if compilation is blocking, + // so we avoid blocking compiles for anything in the java.lang.ref.Reference class, + // including inner classes such as ReferenceHandler. + return false; + } + return true; + } + return false; }