Mercurial > hg > openjdk > aarch64-port > jdk
changeset 10928:bcf6bc094c51
Merge
author | amurillo |
---|---|
date | Mon, 29 Jun 2015 16:55:20 -0700 |
parents | 48143da4c15d (current diff) 2b2f12860573 (diff) |
children | e9f82302d5fd |
files | |
diffstat | 2 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/java/lang/invoke/InjectedProfile.java Mon Jun 29 16:55:20 2015 -0700 @@ -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 { +}
--- a/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Sat Jun 27 23:22:15 2015 -0700 +++ b/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Mon Jun 29 16:55:20 2015 -0700 @@ -669,6 +669,11 @@ 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;