Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/synchronizer.hpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | e7d8cbe4db3b |
children | 89152779163c |
line wrap: on
line diff
--- a/src/share/vm/runtime/synchronizer.hpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/runtime/synchronizer.hpp Tue Apr 01 13:57:07 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, 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 @@ -49,7 +49,7 @@ // to use enter() and exit() in order to make sure user be ware // of the performance and semantics difference. They are normally // used by ObjectLocker etc. The interpreter and compiler use - // assembly copies of these routines. Please keep them synchronized. + // assembly copies of these routines. Please keep them synchornized. // // attempt_rebias flag is used by UseBiasedLocking implementation static void fast_enter (Handle obj, BasicLock* lock, bool attempt_rebias, TRAPS); @@ -68,7 +68,7 @@ static void jni_exit (oop obj, Thread* THREAD); // Handle all interpreter, compiler and jni cases - static int wait (Handle obj, jlong millis, TRAPS); + static void wait (Handle obj, jlong millis, TRAPS); static void notify (Handle obj, TRAPS); static void notifyall (Handle obj, TRAPS);