--- old/test/compiler/dependencies/MonomorphicObjectCall/java/lang/Object.java 2016-03-30 16:16:44.982219745 +0200 +++ /dev/null 2016-03-30 08:46:01.229084022 +0200 @@ -1,97 +0,0 @@ -/* - * 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; - -import jdk.internal.HotSpotIntrinsicCandidate; - -/** - * Slightly modified version of java.lang.Object that replaces - * finalize() by finalizeObject() to avoid overriding in subclasses. - */ -public class Object { - - @HotSpotIntrinsicCandidate - public Object() {} - - private static native void registerNatives(); - static { - registerNatives(); - } - - @HotSpotIntrinsicCandidate - public final native Class getClass(); - - @HotSpotIntrinsicCandidate - public native int hashCode(); - - public boolean equals(Object obj) { - return (this == obj); - } - - @HotSpotIntrinsicCandidate - protected native Object clone() throws CloneNotSupportedException; - - public String toString() { - return getClass().getName() + "@" + Integer.toHexString(hashCode()); - } - - @HotSpotIntrinsicCandidate - public final native void notify(); - - @HotSpotIntrinsicCandidate - 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 { } -} --- /dev/null 2016-03-30 08:46:01.229084022 +0200 +++ new/test/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java 2016-03-30 16:16:44.866219740 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 1994, 2016, 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; + +import jdk.internal.HotSpotIntrinsicCandidate; + +/** + * Slightly modified version of java.lang.Object that replaces + * finalize() by finalizeObject() to avoid overriding in subclasses. + */ +public class Object { + + @HotSpotIntrinsicCandidate + public Object() {} + + private static native void registerNatives(); + static { + registerNatives(); + } + + @HotSpotIntrinsicCandidate + public final native Class getClass(); + + @HotSpotIntrinsicCandidate + public native int hashCode(); + + public boolean equals(Object obj) { + return (this == obj); + } + + @HotSpotIntrinsicCandidate + protected native Object clone() throws CloneNotSupportedException; + + public String toString() { + return getClass().getName() + "@" + Integer.toHexString(hashCode()); + } + + @HotSpotIntrinsicCandidate + public final native void notify(); + + @HotSpotIntrinsicCandidate + 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 { } +}