diff options
author | vlivanov <none@none> | 2015-06-11 14:20:01 +0300 |
---|---|---|
committer | vlivanov <none@none> | 2015-06-11 14:20:01 +0300 |
commit | 8516788a6ff0d340529f233e7c7dd9958c3f8385 (patch) | |
tree | f5f21e2bb8625b90202a7c9787f2d124aa3ca924 /src/share/classes/java/lang | |
parent | 43665177de9f1b7339d4fd0a915556099af1a7e1 (diff) | |
download | jdk8u_jdk-8516788a6ff0d340529f233e7c7dd9958c3f8385.tar.gz |
8074551: GWT can be marked non-compilable due to deopt count pollution
Reviewed-by: kvn
Diffstat (limited to 'src/share/classes/java/lang')
-rw-r--r-- | src/share/classes/java/lang/invoke/InjectedProfile.java | 37 | ||||
-rw-r--r-- | src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java | 5 |
2 files changed, 42 insertions, 0 deletions
diff --git a/src/share/classes/java/lang/invoke/InjectedProfile.java b/src/share/classes/java/lang/invoke/InjectedProfile.java new file mode 100644 index 0000000000..2680e57543 --- /dev/null +++ b/src/share/classes/java/lang/invoke/InjectedProfile.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2015, 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.invoke; + +import java.lang.annotation.*; + +/** + * Internal marker for some methods in the JSR 292 implementation. + */ +/*non-public*/ +@Target({ElementType.METHOD, ElementType.CONSTRUCTOR}) +@Retention(RetentionPolicy.RUNTIME) +@interface InjectedProfile { +} diff --git a/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index d9c6f0ffbd..8af8e16da8 100644 --- a/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -669,6 +669,11 @@ class InvokerBytecodeGenerator { switch (intr) { case SELECT_ALTERNATIVE: assert isSelectAlternative(i); + if (PROFILE_GWT) { + assert(name.arguments[0] instanceof Name && + nameRefersTo((Name)name.arguments[0], MethodHandleImpl.class, "profileBoolean")); + mv.visitAnnotation("Ljava/lang/invoke/InjectedProfile;", true); + } onStack = emitSelectAlternative(name, lambdaForm.names[i+1]); i++; // skip MH.invokeBasic of the selectAlternative result continue; |