mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8050079: crash while compiling java.lang.ref.Finalizer::runFinalizer
Ignore non-instance Klasses in the subclass hierarchy. Reviewed-by: kvn, iignatyev, jrose
This commit is contained in:
parent
68b0d32b05
commit
5ef6d4e99d
4 changed files with 192 additions and 27 deletions
|
@ -0,0 +1,87 @@
|
|||
/*
|
||||
* Copyright (c) 1994, 2014, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package java.lang;
|
||||
|
||||
/**
|
||||
* Slightly modified version of java.lang.Object that replaces
|
||||
* finalize() by finalizeObject() to avoid overriding in subclasses.
|
||||
*/
|
||||
public class Object {
|
||||
|
||||
private static native void registerNatives();
|
||||
static {
|
||||
registerNatives();
|
||||
}
|
||||
|
||||
public final native Class<?> getClass();
|
||||
|
||||
public native int hashCode();
|
||||
|
||||
public boolean equals(Object obj) {
|
||||
return (this == obj);
|
||||
}
|
||||
|
||||
protected native Object clone() throws CloneNotSupportedException;
|
||||
|
||||
public String toString() {
|
||||
return getClass().getName() + "@" + Integer.toHexString(hashCode());
|
||||
}
|
||||
|
||||
public final native void notify();
|
||||
|
||||
public final native void notifyAll();
|
||||
|
||||
public final native void wait(long timeout) throws InterruptedException;
|
||||
|
||||
public final void wait(long timeout, int nanos) throws InterruptedException {
|
||||
if (timeout < 0) {
|
||||
throw new IllegalArgumentException("timeout value is negative");
|
||||
}
|
||||
|
||||
if (nanos < 0 || nanos > 999999) {
|
||||
throw new IllegalArgumentException(
|
||||
"nanosecond timeout value out of range");
|
||||
}
|
||||
|
||||
if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
|
||||
timeout++;
|
||||
}
|
||||
|
||||
wait(timeout);
|
||||
}
|
||||
|
||||
public final void wait() throws InterruptedException {
|
||||
wait(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces original finalize() method and is therefore not
|
||||
* overridden by any subclasses of Object.
|
||||
* @throws Throwable
|
||||
*/
|
||||
// protected void finalize() throws Throwable { }
|
||||
public void finalizeObject() throws Throwable { }
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue