Attachment #204625 for bug #359943

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java (-1 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 58-63 public interface ClassFileConstants { Link Here
58	int MethodRefTag = 10;	58	int MethodRefTag = 10;
59	int InterfaceMethodRefTag = 11;	59	int InterfaceMethodRefTag = 11;
60	int NameAndTypeTag = 12;	60	int NameAndTypeTag = 12;
		61	int MethodHandleTag = 15;
		62	int MethodTypeTag = 16;
		63	int InvokeDynamicTag = 18;
61		64
62	int ConstantMethodRefFixedSize = 5;	65	int ConstantMethodRefFixedSize = 5;
63	int ConstantClassFixedSize = 3;	66	int ConstantClassFixedSize = 3;
Lines 70-75 public interface ClassFileConstants { Link Here
70	int ConstantStringFixedSize = 3;	73	int ConstantStringFixedSize = 3;
71	int ConstantUtf8FixedSize = 3;	74	int ConstantUtf8FixedSize = 3;
72	int ConstantNameAndTypeFixedSize = 5;	75	int ConstantNameAndTypeFixedSize = 5;
		76	int ConstantMethodHandleFixedSize = 4;
		77	int ConstantMethodTypeFixedSize = 3;
		78	int ConstantInvokeDynamicFixedSize = 5;
73		79
74	int MAJOR_VERSION_1_1 = 45;	80	int MAJOR_VERSION_1_1 = 45;
75	int MAJOR_VERSION_1_2 = 46;	81	int MAJOR_VERSION_1_2 = 46;




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

				case ClassFileConstants.NameAndTypeTag :
					this.constantPoolOffsets[i] = readOffset;
					readOffset += ClassFileConstants.ConstantNameAndTypeFixedSize;
					break;
				case ClassFileConstants.MethodHandleTag :
					this.constantPoolOffsets[i] = readOffset;
					readOffset += ClassFileConstants.ConstantMethodHandleFixedSize;
					break;
				case ClassFileConstants.MethodTypeTag :
					this.constantPoolOffsets[i] = readOffset;
					readOffset += ClassFileConstants.ConstantMethodTypeFixedSize;
					break;
				case ClassFileConstants.InvokeDynamicTag :
					this.constantPoolOffsets[i] = readOffset;
					readOffset += ClassFileConstants.ConstantInvokeDynamicFixedSize;
					break;
			}
		}
		// Read and validate access flags




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		// default behavior is to do nothing
	}
	/**
	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry, IConstantPoolEntry)
	 * @since 3.6
	 * @deprecated This has been replaced with {@link IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)}
	 */
	public void _invokedynamic(
			int pc,

		// default behavior is to do nothing
	}
	/**
	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
	 * @since 3.8
	 */
	public void _invokedynamic(
			int pc,
			int index,
			IConstantPoolEntry invokeDynamicEntry) {
		// default behavior is to do nothing
	}
	/**
	 * @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)
	 */
	public void _invokeinterface(

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java (-1 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 140-143 public interface IAttributeNamesConstants { Link Here
140	* @since 3.2	140	* @since 3.2
141	*/	141	*/
142	char[] STACK_MAP = "StackMap".toCharArray(); //$NON-NLS-1$	142	char[] STACK_MAP = "StackMap".toCharArray(); //$NON-NLS-1$
		143
		144	/**
		145	* "BootstrapMethods" attribute (added in cldc1.0).
		146	* @since 3.8
		147	*/
		148	char[] BOOTSTRAP_METHODS = "BootstrapMethods".toCharArray(); //$NON-NLS-1$
143	}	149	}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.util;

/**
 * Description of a bootstrap methods attribute as described in the JVM specifications.
 *
 * This interface may be implemented by clients.
 *
 * @since 3.8
 */
public interface IBootstrapMethodsAttribute extends IClassFileAttribute {

	/**
	 * Answer back the number of bootstrap methods of this entry as specified in
	 * the JVM specifications.
	 *
	 * @return the local variable table length of this entry as specified in
	 * the JVM specifications
	 */
	int getBootstrapMethodsLength();

	/**
	 * Answer back the bootstrap methods table of this entry as specified in
	 * the JVM specifications. Answer an empty array if none.
	 *
	 * @return the bootstrap methods table of this entry as specified in
	 * the JVM specifications. Answer an empty array if none
	 */
	IBootstrapMethodsEntry[] getBootstrapMethods();

}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.util;

/**
 * Description of a bootstrap method table entry as specified in the JVM specifications.
 *
 * This interface may be implemented by clients.
 *
 * @since 3.8
 */
public interface IBootstrapMethodsEntry {

	int getBootstrapMethodReference();
	int[] getBootstrapArguments();
}




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		IConstantPoolEntry constantClass);
	/**
	 * @since 3.6
	 * @deprecated This has been replaced with {@link #_invokedynamic(int, int, IConstantPoolEntry)}
	 */
	void _invokedynamic(
			int pc,
			int index,
			IConstantPoolEntry nameEntry,
			IConstantPoolEntry descriptorEntry);
	/**
	 * @since 3.8
	 */
	void _invokedynamic(
			int pc,
			int index,
			IConstantPoolEntry invokeDynamic);
	void _invokeinterface(
		int pc,
		int index,




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	int getConstantPoolCount();

	/**
	 * Answer back the type of the entry at the given index in the constant pool.
	 * in the constant pool.
	 *
	 * @param index the index of the entry in the constant pool
	 * @return the type of the entry at the index @index in the constant pool

	int getEntryKind(int index);

	/**
	 * Answer back the entry at the given index in the constant pool.
	 * 
	 * <p>The return value can be an instance of {@link IConstantPoolEntry2} if the value returned
	 * by {@link #getEntryKind(int)} is either {@link IConstantPoolConstant#CONSTANT_MethodHandle},
	 * {@link IConstantPoolConstant#CONSTANT_MethodType} or {@link IConstantPoolConstant#CONSTANT_InvokeDynamic}.</p>
	 *
	 * @param index the index of the entry in the constant pool
	 * @return the entry at the given index in the constant pool
	 */
	IConstantPoolEntry decodeEntry(int index);
}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java (-1 / +70 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 29-34 public interface IConstantPoolConstant { Link Here
29	int CONSTANT_Double = 6;	29	int CONSTANT_Double = 6;
30	int CONSTANT_NameAndType = 12;	30	int CONSTANT_NameAndType = 12;
31	int CONSTANT_Utf8 = 1;	31	int CONSTANT_Utf8 = 1;
		32	/**
		33	* @since 3.8
		34	*/
		35	int CONSTANT_MethodHandle = 15;
		36	/**
		37	* @since 3.8
		38	*/
		39	int CONSTANT_MethodType = 16;
		40	/**
		41	* @since 3.8
		42	*/
		43	int CONSTANT_InvokeDynamic = 18;
32		44
33	int CONSTANT_Methodref_SIZE = 5;	45	int CONSTANT_Methodref_SIZE = 5;
34	int CONSTANT_Class_SIZE = 3;	46	int CONSTANT_Class_SIZE = 3;
Lines 41-45 public interface IConstantPoolConstant { Link Here
41	int CONSTANT_String_SIZE = 3;	53	int CONSTANT_String_SIZE = 3;
42	int CONSTANT_Utf8_SIZE = 3;	54	int CONSTANT_Utf8_SIZE = 3;
43	int CONSTANT_NameAndType_SIZE = 5;	55	int CONSTANT_NameAndType_SIZE = 5;
		56	/**
		57	* @since 3.8
		58	*/
		59	int CONSTANT_MethodHandle_SIZE = 4;
		60	/**
		61	* @since 3.8
		62	*/
		63	int CONSTANT_MethodType_SIZE = 3;
		64	/**
		65	* @since 3.8
		66	*/
		67	int CONSTANT_InvokeDynamic_SIZE = 5;
44		68
		69	/**
		70	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		71	* @since 3.8
		72	*/
		73	int METHOD_TYPE_REF_GetField = 1;
		74	/**
		75	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		76	* @since 3.8
		77	*/
		78	int METHOD_TYPE_REF_GetStatic = 2;
		79	/**
		80	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		81	* @since 3.8
		82	*/
		83	int METHOD_TYPE_REF_PutField = 3;
		84	/**
		85	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		86	* @since 3.8
		87	*/
		88	int METHOD_TYPE_REF_PutStatic = 4;
		89	/**
		90	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		91	* @since 3.8
		92	*/
		93	int METHOD_TYPE_REF_InvokeVirtual = 5;
		94	/**
		95	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		96	* @since 3.8
		97	*/
		98	int METHOD_TYPE_REF_InvokeStatic = 6;
		99	/**
		100	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		101	* @since 3.8
		102	*/
		103	int METHOD_TYPE_REF_InvokeSpecial = 7;
		104	/**
		105	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		106	* @since 3.8
		107	*/
		108	int METHOD_TYPE_REF_NewInvokeSpecial = 8;
		109	/**
		110	* The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
		111	* @since 3.8
		112	*/
		113	int METHOD_TYPE_REF_InvokeInterface = 9;
45	}	114	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java (-10 / +47 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 32-37 public interface IConstantPoolEntry { Link Here
32	* The value is unspecified otherwise.	32	* The value is unspecified otherwise.
33	*	33	*
34	* @return the name index for a CONSTANT_Class type entry	34	* @return the name index for a CONSTANT_Class type entry
		35	* @see IConstantPoolConstant#CONSTANT_Class
35	*/	36	*/
36	int getClassInfoNameIndex();	37	int getClassInfoNameIndex();
37		38
Lines 42-57 public interface IConstantPoolEntry { Link Here
42	*	43	*
43	* @return the class index for a CONSTANT_Fieldref,	44	* @return the class index for a CONSTANT_Fieldref,
44	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry	45	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry
		46	* @see IConstantPoolConstant#CONSTANT_Fieldref
		47	* @see IConstantPoolConstant#CONSTANT_Methodref
		48	* @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
45	*/	49	*/
46	int getClassIndex();	50	int getClassIndex();
47		51
48	/**	52	/**
49	* Returns the nameAndType index for a CONSTANT_Fieldref,	53	* Returns the nameAndType index for a CONSTANT_Fieldref,
50	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry.	54	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
		55	* CONSTANT_InvokeDynamic type entry.
51	* The value is unspecified otherwise.	56	* The value is unspecified otherwise.
52	*	57	*
53	* @return the nameAndType index for a CONSTANT_Fieldref,	58	* @return the nameAndType index for a CONSTANT_Fieldref,
54	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry	59	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
		60	* CONSTANT_InvokeDynamic type entry
		61	* @see IConstantPoolConstant#CONSTANT_Fieldref
		62	* @see IConstantPoolConstant#CONSTANT_Methodref
		63	* @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
		64	* @see IConstantPoolConstant#CONSTANT_InvokeDynamic
55	*/	65	*/
56	int getNameAndTypeIndex();	66	int getNameAndTypeIndex();
57		67
Lines 60-65 public interface IConstantPoolEntry { Link Here
60	* The value is unspecified otherwise.	70	* The value is unspecified otherwise.
61	*	71	*
62	* @return the string index for a CONSTANT_String type entry	72	* @return the string index for a CONSTANT_String type entry
		73	* @see IConstantPoolConstant#CONSTANT_String
63	*/	74	*/
64	int getStringIndex();	75	int getStringIndex();
65		76
Lines 68-73 public interface IConstantPoolEntry { Link Here
68	* Returns null otherwise.	79	* Returns null otherwise.
69	*	80	*
70	* @return the string value for a CONSTANT_String type entry	81	* @return the string value for a CONSTANT_String type entry
		82	* @see IConstantPoolConstant#CONSTANT_String
71	*/	83	*/
72	String getStringValue();	84	String getStringValue();
73		85
Lines 76-81 public interface IConstantPoolEntry { Link Here
76	* The value is unspecified otherwise.	88	* The value is unspecified otherwise.
77	*	89	*
78	* @return the integer value for a CONSTANT_Integer type entry	90	* @return the integer value for a CONSTANT_Integer type entry
		91	* @see IConstantPoolConstant#CONSTANT_Integer
79	*/	92	*/
80	int getIntegerValue();	93	int getIntegerValue();
81		94
Lines 84-89 public interface IConstantPoolEntry { Link Here
84	* The value is unspecified otherwise.	97	* The value is unspecified otherwise.
85	*	98	*
86	* @return the float value for a CONSTANT_Float type entry	99	* @return the float value for a CONSTANT_Float type entry
		100	* @see IConstantPoolConstant#CONSTANT_Float
87	*/	101	*/
88	float getFloatValue();	102	float getFloatValue();
89		103
Lines 92-97 public interface IConstantPoolEntry { Link Here
92	* The value is unspecified otherwise.	106	* The value is unspecified otherwise.
93	*	107	*
94	* @return the double value for a CONSTANT_Double type entry	108	* @return the double value for a CONSTANT_Double type entry
		109	* @see IConstantPoolConstant#CONSTANT_Double
95	*/	110	*/
96	double getDoubleValue();	111	double getDoubleValue();
97		112
Lines 100-105 public interface IConstantPoolEntry { Link Here
100	* The value is unspecified otherwise.	115	* The value is unspecified otherwise.
101	*	116	*
102	* @return the long value for a CONSTANT_Long type entry	117	* @return the long value for a CONSTANT_Long type entry
		118	* @see IConstantPoolConstant#CONSTANT_Long
103	*/	119	*/
104	long getLongValue();	120	long getLongValue();
105		121
Lines 108-113 public interface IConstantPoolEntry { Link Here
108	* The value is unspecified otherwise.	124	* The value is unspecified otherwise.
109	*	125	*
110	* @return the descriptor index for a CONSTANT_NameAndType type entry	126	* @return the descriptor index for a CONSTANT_NameAndType type entry
		127	* @see IConstantPoolConstant#CONSTANT_NameAndType
111	*/	128	*/
112	int getNameAndTypeInfoDescriptorIndex();	129	int getNameAndTypeInfoDescriptorIndex();
113		130
Lines 116-121 public interface IConstantPoolEntry { Link Here
116	* The value is unspecified otherwise.	133	* The value is unspecified otherwise.
117	*	134	*
118	* @return the name index for a CONSTANT_NameAndType type entry	135	* @return the name index for a CONSTANT_NameAndType type entry
		136	* @see IConstantPoolConstant#CONSTANT_NameAndType
119	*/	137	*/
120	int getNameAndTypeInfoNameIndex();	138	int getNameAndTypeInfoNameIndex();
121		139
Lines 124-129 public interface IConstantPoolEntry { Link Here
124	* Returns null otherwise.	142	* Returns null otherwise.
125	*	143	*
126	* @return the class name for a CONSTANT_Class type entry	144	* @return the class name for a CONSTANT_Class type entry
		145	* @see IConstantPoolConstant#CONSTANT_Class
127	*/	146	*/
128	char[] getClassInfoName();	147	char[] getClassInfoName();
129		148
Lines 134-139 public interface IConstantPoolEntry { Link Here
134	*	153	*
135	* @return the class name for a CONSTANT_Fieldref,	154	* @return the class name for a CONSTANT_Fieldref,
136	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry	155	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry
		156	* @see IConstantPoolConstant#CONSTANT_Fieldref
		157	* @see IConstantPoolConstant#CONSTANT_Methodref
		158	* @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
137	*/	159	*/
138	char[] getClassName();	160	char[] getClassName();
139		161
Lines 142-157 public interface IConstantPoolEntry { Link Here
142	* Returns null otherwise.	164	* Returns null otherwise.
143	*	165	*
144	* @return the field name for a CONSTANT_Fieldref type entry	166	* @return the field name for a CONSTANT_Fieldref type entry
		167	* @see IConstantPoolConstant#CONSTANT_Fieldref
145	*/	168	*/
146	char[] getFieldName();	169	char[] getFieldName();
147		170
148	/**	171	/**
149	* Returns the field name for a CONSTANT_Methodref or CONSTANT_InterfaceMethodred	172	* Returns the field name for a CONSTANT_Methodref, CONSTANT_InterfaceMethodref
150	* type entry.	173	* or CONSTANT_InvokeDynamic type entry.
151	* Returns null otherwise.	174	* Returns null otherwise.
152	*	175	*
153	* @return the field name for a CONSTANT_Methodref or CONSTANT_InterfaceMethodred	176	* @return the method name for a CONSTANT_Methodref, CONSTANT_InterfaceMethodref
154	* type entry	177	* or CONSTANT_InvokeDynamic type entry
		178	* @see IConstantPoolConstant#CONSTANT_Methodref
		179	* @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
		180	* @see IConstantPoolConstant#CONSTANT_InvokeDynamic
155	*/	181	*/
156	char[] getMethodName();	182	char[] getMethodName();
157		183
Lines 162-179 public interface IConstantPoolEntry { Link Here
162	*	188	*
163	* @return the field descriptor value for a CONSTANT_Fieldref type entry. This value	189	* @return the field descriptor value for a CONSTANT_Fieldref type entry. This value
164	* is set only when decoding the CONSTANT_Fieldref entry	190	* is set only when decoding the CONSTANT_Fieldref entry
		191	* @see IConstantPoolConstant#CONSTANT_Fieldref
165	*/	192	*/
166	char[] getFieldDescriptor();	193	char[] getFieldDescriptor();
167		194
168	/**	195	/**
169	* Returns the method descriptor value for a CONSTANT_Methodref or	196	* Returns the method descriptor value for a CONSTANT_Methodref or
170	* CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the	197	* CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the
171	* CONSTANT_Methodref or CONSTANT_InterfaceMethodref entry.	198	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref, CONSTANT_MethodType
		199	* or CONSTANT_InvokeDynamic entry.
		200	*
172	* Returns null otherwise.	201	* Returns null otherwise.
173	*	202	*
174	* @return the method descriptor value for a CONSTANT_Methodref or	203	* @return the method descriptor value for a CONSTANT_Methodref,
175	* CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the	204	* CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the
176	* CONSTANT_Methodref or CONSTANT_InterfaceMethodref entry	205	* CONSTANT_Methodref, CONSTANT_InterfaceMethodref, CONSTANT_MethodType
		206	* or CONSTANT_InvokeDynamic entry
		207	*
		208	* @see IConstantPoolConstant#CONSTANT_Methodref
		209	* @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
		210	* @see IConstantPoolConstant#CONSTANT_MethodType
		211	* @see IConstantPoolConstant#CONSTANT_InvokeDynamic
177	*/	212	*/
178	char[] getMethodDescriptor();	213	char[] getMethodDescriptor();
179		214
Lines 184-189 public interface IConstantPoolEntry { Link Here
184	*	219	*
185	* @return the utf8 value for a CONSTANT_Utf8 type entry. This value is set only when	220	* @return the utf8 value for a CONSTANT_Utf8 type entry. This value is set only when
186	* decoding a UTF8 entry	221	* decoding a UTF8 entry
		222	* @see IConstantPoolConstant#CONSTANT_Utf8
187	*/	223	*/
188	char[] getUtf8Value();	224	char[] getUtf8Value();
189		225
Lines 194-199 public interface IConstantPoolEntry { Link Here
194	*	230	*
195	* @return the utf8 length for a CONSTANT_Utf8 type entry. This value is set only when	231	* @return the utf8 length for a CONSTANT_Utf8 type entry. This value is set only when
196	* decoding a UTF8 entry	232	* decoding a UTF8 entry
		233	* @see IConstantPoolConstant#CONSTANT_Utf8
197	*/	234	*/
198	int getUtf8Length();	235	int getUtf8Length();
199	}	236	}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.util;

/**
 * Description of the new constant pool entry as described in the JVM specifications
 * added for Java 7 support.
 * Its contents is initialized according to its kind.
 *
 * This interface may be implemented by clients.
 *
 * @since 3.8
 */
public interface IConstantPoolEntry2 extends IConstantPoolEntry {
	/**
	 * Returns the descriptor index. This value is set only when decoding a MethodType entry.
	 * The value is unspecified otherwise. The corresponding UTF8 value can be retrieved by using
	 * {@link #getMethodDescriptor()}.
	 *
	 * @return the descriptor index. This value is set only when decoding a MethodType entry.
	 * @see IConstantPoolConstant#CONSTANT_MethodType
	 */
	int getDescriptorIndex();

	/**
	 * Returns the reference kind. This value is set only when decoding a MethodHandle entry.
	 * The value is unspecified otherwise.
	 *
	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
	 * @see IConstantPoolConstant#CONSTANT_MethodHandle
	 */
	int getReferenceKind();

	/**
	 * Returns the reference index. This value is set only when decoding a MethodHandle entry.
	 * The value is unspecified otherwise.
	 *
	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
	 * @see IConstantPoolConstant#CONSTANT_MethodHandle
	 */
	int getReferenceIndex();
	
	/**
	 * Returns the bootstrap method attribute index. This value is set only when decoding a InvokeDynamic entry.
	 * The value is unspecified otherwise.
	 *
	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
	 * @see IConstantPoolConstant#CONSTANT_InvokeDynamic
	 */
	int getBootstrapMethodAttributeIndex();
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.core.util;

import org.eclipse.jdt.core.util.ClassFormatException;
import org.eclipse.jdt.core.util.IBootstrapMethodsAttribute;
import org.eclipse.jdt.core.util.IBootstrapMethodsEntry;
import org.eclipse.jdt.core.util.IConstantPool;

/**
 * Default implementation of IBootstrapMethodsAttribute.
 */
public class BootstrapMethodsAttribute extends ClassFileAttribute implements IBootstrapMethodsAttribute {
	private static final IBootstrapMethodsEntry[] NO_ENTRIES = new IBootstrapMethodsEntry[0];

	private IBootstrapMethodsEntry[] entries;
	private int numberOfBootstrapMethods;

	/**
	 * Constructor for BootstrapMethodsAttribute.
	 * @param classFileBytes
	 * @param constantPool
	 * @param offset
	 * @throws ClassFormatException
	 */
	public BootstrapMethodsAttribute(
			byte[] classFileBytes,
			IConstantPool constantPool,
			int offset) throws ClassFormatException {
		super(classFileBytes, constantPool, offset);
		this.numberOfBootstrapMethods = u2At(classFileBytes, 6, offset);
		final int length = this.numberOfBootstrapMethods;
		if (length != 0) {
			int readOffset = 8;
			this.entries = new IBootstrapMethodsEntry[length];
			for (int i = 0; i < length; i++) {
				this.entries[i] = new BootstrapMethodsEntry(classFileBytes, constantPool, offset + readOffset);
				readOffset += 8;
			}
		} else {
			this.entries = NO_ENTRIES;
		}
	}

	/**
	 * @see IBootstrapMethodsAttribute#getBootstrapMethods()
	 */
	public IBootstrapMethodsEntry[] getBootstrapMethods() {
		return this.entries;
	}
	
	public int getBootstrapMethodsLength() {
		return this.numberOfBootstrapMethods;
	}
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.core.util;

import org.eclipse.jdt.core.util.ClassFormatException;
import org.eclipse.jdt.core.util.IBootstrapMethodsEntry;
import org.eclipse.jdt.core.util.IConstantPool;

/**
 * Default implementation of {@link IBootstrapMethodsEntry}
 */
public class BootstrapMethodsEntry
	extends ClassFileStruct
	implements IBootstrapMethodsEntry {

	private int bootstrapMethodReference;
	private int[] bootstrapArguments;

	public BootstrapMethodsEntry(byte classFileBytes[], IConstantPool constantPool, int offset) throws ClassFormatException {
		this.bootstrapMethodReference = u2At(classFileBytes, 0, offset);
		int length = u2At(classFileBytes, 2, offset);
		int[] arguments = new int[length];
		int position = 4;
		for (int i = 0; i < length; i++) {
			arguments[i] = u2At(classFileBytes, position, offset);
			position += 2;
		}
		this.bootstrapArguments = arguments;
	}

	/**
	 * @see IBootstrapMethodsEntry#getBootstrapArguments()
	 */
	public int[] getBootstrapArguments() {
		return this.bootstrapArguments;
	}

	/**
	 * @see IBootstrapMethodsEntry#getBootstrapMethodReference()
	 */
	public int getBootstrapMethodReference() {
		return this.bootstrapMethodReference;
	}
}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java (-1 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 140-145 public class ClassFileReader extends ClassFileStruct implements IClassFileReader Link Here
140	constantPoolOffsets[i] = readOffset;	140	constantPoolOffsets[i] = readOffset;
141	readOffset += IConstantPoolConstant.CONSTANT_NameAndType_SIZE;	141	readOffset += IConstantPoolConstant.CONSTANT_NameAndType_SIZE;
142	break;	142	break;
		143	case IConstantPoolConstant.CONSTANT_MethodHandle :
		144	constantPoolOffsets[i] = readOffset;
		145	readOffset += IConstantPoolConstant.CONSTANT_MethodHandle_SIZE;
		146	break;
		147	case IConstantPoolConstant.CONSTANT_MethodType :
		148	constantPoolOffsets[i] = readOffset;
		149	readOffset += IConstantPoolConstant.CONSTANT_MethodType_SIZE;
		150	break;
		151	case IConstantPoolConstant.CONSTANT_InvokeDynamic :
		152	constantPoolOffsets[i] = readOffset;
		153	readOffset += IConstantPoolConstant.CONSTANT_InvokeDynamic_SIZE;
		154	break;
143	default:	155	default:
144	throw new ClassFormatException(ClassFormatException.INVALID_TAG_CONSTANT);	156	throw new ClassFormatException(ClassFormatException.INVALID_TAG_CONSTANT);
145	}	157	}
Lines 261-266 public class ClassFileReader extends ClassFileStruct implements IClassFileReader Link Here
261	this.attributes[attributesIndex++] = new RuntimeVisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);	273	this.attributes[attributesIndex++] = new RuntimeVisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);
262	} else if (equals(attributeName, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS)) {	274	} else if (equals(attributeName, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS)) {
263	this.attributes[attributesIndex++] = new RuntimeInvisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);	275	this.attributes[attributesIndex++] = new RuntimeInvisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);
		276	} else if (equals(attributeName, IAttributeNamesConstants.BOOTSTRAP_METHODS)) {
		277	this.attributes[attributesIndex++] = new BootstrapMethodsAttribute(classFileBytes, this.constantPool, readOffset);
264	} else {	278	} else {
265	this.attributes[attributesIndex++] = new ClassFileAttribute(classFileBytes, this.constantPool, readOffset);	279	this.attributes[attributesIndex++] = new ClassFileAttribute(classFileBytes, this.constantPool, readOffset);
266	}	280	}




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

				case IOpcodeMnemonics.INVOKEDYNAMIC :
					index = u2At(this.classFileBytes, 1, pc);
					constantPoolEntry = this.constantPool.decodeEntry(index);
					if (constantPoolEntry.getKind() != IConstantPoolConstant.CONSTANT_InvokeDynamic) {
						throw new ClassFormatException(ClassFormatException.INVALID_CONSTANT_POOL_ENTRY);
					}
					visitor._invokedynamic(
							pc - this.codeOffset,
							index,
							constantPoolEntry);
							this.constantPool.decodeEntry(constantPoolEntry.getNameAndTypeInfoDescriptorIndex()));
					pc += 5;
					break;
				case IOpcodeMnemonics.NEW :

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java (-4 / +69 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 33-51 public class ConstantPool extends ClassFileStruct implements IConstantPool { Link Here
33	* @see IConstantPool#decodeEntry(int)	33	* @see IConstantPool#decodeEntry(int)
34	*/	34	*/
35	public IConstantPoolEntry decodeEntry(int index) {	35	public IConstantPoolEntry decodeEntry(int index) {
36	ConstantPoolEntry constantPoolEntry = new ConstantPoolEntry();	36	ConstantPoolEntry constantPoolEntry = null;
37	constantPoolEntry.reset();
38	int kind = getEntryKind(index);	37	int kind = getEntryKind(index);
39	constantPoolEntry.setKind(kind);
40	switch(kind) {	38	switch(kind) {
41	case IConstantPoolConstant.CONSTANT_Class :	39	case IConstantPoolConstant.CONSTANT_Class :
		40	constantPoolEntry = new ConstantPoolEntry();
		41	constantPoolEntry.reset();
		42	constantPoolEntry.setKind(kind);
42	constantPoolEntry.setClassInfoNameIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	43	constantPoolEntry.setClassInfoNameIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
43	constantPoolEntry.setClassInfoName(getUtf8ValueAt(constantPoolEntry.getClassInfoNameIndex()));	44	constantPoolEntry.setClassInfoName(getUtf8ValueAt(constantPoolEntry.getClassInfoNameIndex()));
44	break;	45	break;
45	case IConstantPoolConstant.CONSTANT_Double :	46	case IConstantPoolConstant.CONSTANT_Double :
		47	constantPoolEntry = new ConstantPoolEntry();
		48	constantPoolEntry.reset();
		49	constantPoolEntry.setKind(kind);
46	constantPoolEntry.setDoubleValue(doubleAt(this.classFileBytes, 1, this.constantPoolOffset[index]));	50	constantPoolEntry.setDoubleValue(doubleAt(this.classFileBytes, 1, this.constantPoolOffset[index]));
47	break;	51	break;
48	case IConstantPoolConstant.CONSTANT_Fieldref :	52	case IConstantPoolConstant.CONSTANT_Fieldref :
		53	constantPoolEntry = new ConstantPoolEntry();
		54	constantPoolEntry.reset();
		55	constantPoolEntry.setKind(kind);
		56	constantPoolEntry.reset();
		57	constantPoolEntry.setKind(kind);
49	constantPoolEntry.setClassIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	58	constantPoolEntry.setClassIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
50	int declaringClassIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);	59	int declaringClassIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);
51	constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));	60	constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));
Lines 57-62 public class ConstantPool extends ClassFileStruct implements IConstantPool { Link Here
57	break;	66	break;
58	case IConstantPoolConstant.CONSTANT_Methodref :	67	case IConstantPoolConstant.CONSTANT_Methodref :
59	case IConstantPoolConstant.CONSTANT_InterfaceMethodref :	68	case IConstantPoolConstant.CONSTANT_InterfaceMethodref :
		69	constantPoolEntry = new ConstantPoolEntry();
		70	constantPoolEntry.reset();
		71	constantPoolEntry.setKind(kind);
		72	constantPoolEntry.reset();
		73	constantPoolEntry.setKind(kind);
60	constantPoolEntry.setClassIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	74	constantPoolEntry.setClassIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
61	declaringClassIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);	75	declaringClassIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);
62	constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));	76	constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));
Lines 67-91 public class ConstantPool extends ClassFileStruct implements IConstantPool { Link Here
67	constantPoolEntry.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));	81	constantPoolEntry.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
68	break;	82	break;
69	case IConstantPoolConstant.CONSTANT_Float :	83	case IConstantPoolConstant.CONSTANT_Float :
		84	constantPoolEntry = new ConstantPoolEntry();
		85	constantPoolEntry.reset();
		86	constantPoolEntry.setKind(kind);
		87	constantPoolEntry.reset();
		88	constantPoolEntry.setKind(kind);
70	constantPoolEntry.setFloatValue(floatAt(this.classFileBytes, 1, this.constantPoolOffset[index]));	89	constantPoolEntry.setFloatValue(floatAt(this.classFileBytes, 1, this.constantPoolOffset[index]));
71	break;	90	break;
72	case IConstantPoolConstant.CONSTANT_Integer :	91	case IConstantPoolConstant.CONSTANT_Integer :
		92	constantPoolEntry = new ConstantPoolEntry();
		93	constantPoolEntry.reset();
		94	constantPoolEntry.setKind(kind);
73	constantPoolEntry.setIntegerValue(i4At(this.classFileBytes, 1, this.constantPoolOffset[index]));	95	constantPoolEntry.setIntegerValue(i4At(this.classFileBytes, 1, this.constantPoolOffset[index]));
74	break;	96	break;
75	case IConstantPoolConstant.CONSTANT_Long :	97	case IConstantPoolConstant.CONSTANT_Long :
		98	constantPoolEntry = new ConstantPoolEntry();
		99	constantPoolEntry.reset();
		100	constantPoolEntry.setKind(kind);
76	constantPoolEntry.setLongValue(i8At(this.classFileBytes, 1, this.constantPoolOffset[index]));	101	constantPoolEntry.setLongValue(i8At(this.classFileBytes, 1, this.constantPoolOffset[index]));
77	break;	102	break;
78	case IConstantPoolConstant.CONSTANT_NameAndType :	103	case IConstantPoolConstant.CONSTANT_NameAndType :
		104	constantPoolEntry = new ConstantPoolEntry();
		105	constantPoolEntry.reset();
		106	constantPoolEntry.setKind(kind);
79	constantPoolEntry.setNameAndTypeNameIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	107	constantPoolEntry.setNameAndTypeNameIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
80	constantPoolEntry.setNameAndTypeDescriptorIndex(u2At(this.classFileBytes, 3, this.constantPoolOffset[index]));	108	constantPoolEntry.setNameAndTypeDescriptorIndex(u2At(this.classFileBytes, 3, this.constantPoolOffset[index]));
81	break;	109	break;
82	case IConstantPoolConstant.CONSTANT_String :	110	case IConstantPoolConstant.CONSTANT_String :
		111	constantPoolEntry = new ConstantPoolEntry();
		112	constantPoolEntry.reset();
		113	constantPoolEntry.setKind(kind);
83	constantPoolEntry.setStringIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	114	constantPoolEntry.setStringIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
84	constantPoolEntry.setStringValue(getUtf8ValueAt(constantPoolEntry.getStringIndex()));	115	constantPoolEntry.setStringValue(getUtf8ValueAt(constantPoolEntry.getStringIndex()));
85	break;	116	break;
86	case IConstantPoolConstant.CONSTANT_Utf8 :	117	case IConstantPoolConstant.CONSTANT_Utf8 :
		118	constantPoolEntry = new ConstantPoolEntry();
		119	constantPoolEntry.reset();
		120	constantPoolEntry.setKind(kind);
87	constantPoolEntry.setUtf8Length(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));	121	constantPoolEntry.setUtf8Length(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
88	constantPoolEntry.setUtf8Value(getUtf8ValueAt(index));	122	constantPoolEntry.setUtf8Value(getUtf8ValueAt(index));
		123	break;
		124	case IConstantPoolConstant.CONSTANT_MethodHandle :
		125	ConstantPoolEntry2 constantPoolEntry2 = new ConstantPoolEntry2();
		126	constantPoolEntry2.reset();
		127	constantPoolEntry2.setKind(kind);
		128	constantPoolEntry2.setReferenceKind(u1At(this.classFileBytes, 1, this.constantPoolOffset[index]));
		129	constantPoolEntry2.setReferenceIndex(u2At(this.classFileBytes, 2, this.constantPoolOffset[index]));
		130	constantPoolEntry = constantPoolEntry2;
		131	break;
		132	case IConstantPoolConstant.CONSTANT_MethodType :
		133	constantPoolEntry2 = new ConstantPoolEntry2();
		134	constantPoolEntry2.reset();
		135	constantPoolEntry2.setKind(kind);
		136	methodDescriptorIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[index]);
		137	constantPoolEntry2.setDescriptorIndex(methodDescriptorIndex);
		138	constantPoolEntry2.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
		139	constantPoolEntry = constantPoolEntry2;
		140	break;
		141	case IConstantPoolConstant.CONSTANT_InvokeDynamic :
		142	constantPoolEntry2 = new ConstantPoolEntry2();
		143	constantPoolEntry2.reset();
		144	constantPoolEntry2.setKind(kind);
		145	constantPoolEntry2.setBootstrapMethodAttributeIndex(u2At(this.classFileBytes, 1, this.constantPoolOffset[index]));
		146	int nameAndTypeIndex = u2At(this.classFileBytes, 3, this.constantPoolOffset[index]);
		147	constantPoolEntry2.setNameAndTypeIndex(nameAndTypeIndex);
		148	methodNameIndex = u2At(this.classFileBytes, 1, this.constantPoolOffset[nameAndTypeIndex]);
		149	methodDescriptorIndex = u2At(this.classFileBytes, 3, this.constantPoolOffset[nameAndTypeIndex]);
		150	constantPoolEntry2.setMethodName(getUtf8ValueAt(methodNameIndex));
		151	constantPoolEntry2.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
		152	constantPoolEntry = constantPoolEntry2;
		153	break;
89	}	154	}
90	return constantPoolEntry;	155	return constantPoolEntry;
91	}	156	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry.java (-1 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 341-346 public class ConstantPoolEntry implements IConstantPoolEntry { Link Here
341		341
342	/**	342	/**
343	* Sets the methodDescriptor.	343	* Sets the methodDescriptor.
		344	*
344	* @param methodDescriptor The methodDescriptor to set	345	* @param methodDescriptor The methodDescriptor to set
345	*/	346	*/
346	public void setMethodDescriptor(char[] methodDescriptor) {	347	public void setMethodDescriptor(char[] methodDescriptor) {




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.core.util;

import org.eclipse.jdt.core.util.IConstantPoolEntry2;

/**
 * Default implementation of IConstantPoolEntry
 *
 * @since 2.0
 */
public class ConstantPoolEntry2 extends ConstantPoolEntry implements IConstantPoolEntry2 {
	
	private int descriptorIndex;
	private int referenceKind;
	private int referenceIndex;
	private int bootstrapMethodAttributeIndex;
	
	public int getDescriptorIndex() {
		return this.descriptorIndex;
	}

	public int getReferenceKind() {
		return this.referenceKind;
	}

	public int getReferenceIndex() {
		return this.referenceIndex;
	}

	public int getBootstrapMethodAttributeIndex() {
		return this.bootstrapMethodAttributeIndex;
	}

	public void setDescriptorIndex(int descriptorIndex) {
		this.descriptorIndex = descriptorIndex;
	}

	public void setReferenceKind(int referenceKind) {
		this.referenceKind = referenceKind;
	}

	public void setReferenceIndex(int referenceIndex) {
		this.referenceIndex = referenceIndex;
	}

	public void setBootstrapMethodAttributeIndex(int bootstrapMethodAttributeIndex) {
		this.bootstrapMethodAttributeIndex = bootstrapMethodAttributeIndex;
	}
	
	public void reset() {
		super.reset();
		this.descriptorIndex = 0;
		this.referenceKind = 0;
		this.referenceIndex = 0;
		this.bootstrapMethodAttributeIndex = 0;
	}
}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java (-2 / +27 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 17-22 import org.eclipse.jdt.core.util.IBytecodeVisitor; Link Here
17	import org.eclipse.jdt.core.util.ICodeAttribute;	17	import org.eclipse.jdt.core.util.ICodeAttribute;
18	import org.eclipse.jdt.core.util.IConstantPoolConstant;	18	import org.eclipse.jdt.core.util.IConstantPoolConstant;
19	import org.eclipse.jdt.core.util.IConstantPoolEntry;	19	import org.eclipse.jdt.core.util.IConstantPoolEntry;
		20	import org.eclipse.jdt.core.util.IConstantPoolEntry2;
20	import org.eclipse.jdt.core.util.ILocalVariableAttribute;	21	import org.eclipse.jdt.core.util.ILocalVariableAttribute;
21	import org.eclipse.jdt.core.util.ILocalVariableTableEntry;	22	import org.eclipse.jdt.core.util.ILocalVariableTableEntry;
22	import org.eclipse.jdt.core.util.OpcodeStringValues;	23	import org.eclipse.jdt.core.util.OpcodeStringValues;
Lines 1491-1497 public class DefaultBytecodeVisitor implements IBytecodeVisitor { Link Here
1491	writeNewLine();	1492	writeNewLine();
1492	}	1493	}
1493	/**	1494	/**
1494	* @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry, IConstantPoolEntry)	1495	* @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
1495	*/	1496	*/
1496	public void _invokedynamic(	1497	public void _invokedynamic(
1497	int pc,	1498	int pc,
Lines 1513-1518 public class DefaultBytecodeVisitor implements IBytecodeVisitor { Link Here
1513	writeNewLine();	1514	writeNewLine();
1514	}	1515	}
1515	/**	1516	/**
		1517	* @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
		1518	*/
		1519	public void _invokedynamic(
		1520	int pc,
		1521	int index,
		1522	IConstantPoolEntry invokeDynamicEntry) {
		1523
		1524	dumpPcNumber(pc);
		1525	IConstantPoolEntry2 entry = (IConstantPoolEntry2) invokeDynamicEntry;
		1526	this.buffer.append(Messages.bind(Messages.classformat_invokedynamic,
		1527	new String[] {
		1528	OpcodeStringValues.BYTECODE_NAMES[IOpcodeMnemonics.INVOKEDYNAMIC],
		1529	Integer.toString(index),
		1530	Integer.toString(entry.getBootstrapMethodAttributeIndex()),
		1531	Util.toString(
		1532	null,
		1533	entry.getMethodName(),
		1534	entry.getMethodDescriptor(),
		1535	true,
		1536	isCompact())
		1537	}));
		1538	writeNewLine();
		1539	}
		1540	/**
1516	* @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)	1541	* @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)
1517	*/	1542	*/
1518	public void _invokeinterface(	1543	public void _invokeinterface(




		IClassFileAttribute runtimeVisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_VISIBLE_ANNOTATIONS);
		IClassFileAttribute runtimeInvisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS);

		IClassFileAttribute bootstrapMethods = Util.getAttribute(classFileReader, IAttributeNamesConstants.BOOTSTRAP_METHODS);

		if (checkMode(mode, DETAILED)) {
			// disassemble compact version of annotations
			if (runtimeInvisibleAnnotationsAttribute != null) {

			IClassFileAttribute[] attributes = classFileReader.getAttributes();
			int length = attributes.length;
			IEnclosingMethodAttribute enclosingMethodAttribute = getEnclosingMethodAttribute(classFileReader);
			int remainingAttributesLength = length;
			if (innerClassesAttribute != null) {
				remainingAttributesLength--;
			}
			if (enclosingMethodAttribute != null) {
				remainingAttributesLength--;
			}
			if (sourceAttribute != null) {
				remainingAttributesLength--;
			}
			if (signatureAttribute != null) {
				remainingAttributesLength--;
			}
			if (innerClassesAttribute != null || enclosingMethodAttribute != null || remainingAttributesLength != 0) {
				writeNewLine(buffer, lineSeparator, 0);
			}
			if (innerClassesAttribute != null) {
				disassemble(innerClassesAttribute, buffer, lineSeparator, 1);
			}
			if (enclosingMethodAttribute != null) {
				disassemble(enclosingMethodAttribute, buffer, lineSeparator, 0);
			}
			if (bootstrapMethods != null) {
				disassemble((IBootstrapMethodsAttribute) bootstrapMethods, buffer, lineSeparator, 0);
			}
			if (checkMode(mode, SYSTEM)) {
				if (runtimeVisibleAnnotationsAttribute != null) {
					disassemble((IRuntimeVisibleAnnotationsAttribute) runtimeVisibleAnnotationsAttribute, buffer, lineSeparator, 0, mode);

					for (int i = 0; i < length; i++) {
						IClassFileAttribute attribute = attributes[i];
						if (attribute != innerClassesAttribute
								&& attribute != sourceAttribute
								&& attribute != signatureAttribute
								&& attribute != enclosingMethodAttribute
								&& attribute != runtimeInvisibleAnnotationsAttribute
								&& attribute != runtimeVisibleAnnotationsAttribute
								&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.DEPRECATED)
								&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.SYNTHETIC)
								&& attribute != bootstrapMethods) {
							disassemble(attribute, buffer, lineSeparator, 0, mode);
						}
					}

								Integer.toString(i),
								decodeStringValue(new String(constantPoolEntry.getUtf8Value()))}));
					break;
				case IConstantPoolConstant.CONSTANT_MethodHandle :
					IConstantPoolEntry2 entry2 = (IConstantPoolEntry2) constantPoolEntry;
					buffer.append(
							Messages.bind(Messages.disassembler_constantpool_methodhandle,
								new String[] {
									Integer.toString(i),
									getReferenceKind(entry2.getReferenceKind()),
									Integer.toString(entry2.getReferenceIndex()),
								}));
					break;
				case IConstantPoolConstant.CONSTANT_MethodType :
					entry2 = (IConstantPoolEntry2) constantPoolEntry;
					buffer.append(
							Messages.bind(Messages.disassembler_constantpool_methodtype,
								new String[] {
									Integer.toString(i),
									Integer.toString(entry2.getDescriptorIndex()),
									String.valueOf(entry2.getMethodDescriptor()),
								}));
					break;
				case IConstantPoolConstant.CONSTANT_InvokeDynamic :
					entry2 = (IConstantPoolEntry2) constantPoolEntry;
					buffer.append(
						Messages.bind(Messages.disassembler_constantpool_invokedynamic,
							new String[] {
								Integer.toString(i),
								Integer.toString(entry2.getBootstrapMethodAttributeIndex()),
								Integer.toString(entry2.getNameAndTypeIndex()),
								new String(constantPoolEntry.getMethodName()),
								new String(constantPoolEntry.getMethodDescriptor())
							}));
			}
		}
	}
	
	private String getReferenceKind(int referenceKind) {
		String message = null;
		switch(referenceKind) {
			case IConstantPoolConstant.METHOD_TYPE_REF_GetField :
				message = Messages.disassembler_method_type_ref_getfield;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_GetStatic :
				message = Messages.disassembler_method_type_ref_getstatic;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_PutField :
				message = Messages.disassembler_method_type_ref_putfield;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_PutStatic :
				message = Messages.disassembler_method_type_ref_putstatic;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeInterface :
				message = Messages.disassembler_method_type_ref_invokeinterface;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeSpecial :
				message = Messages.disassembler_method_type_ref_invokespecial;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeStatic :
				message = Messages.disassembler_method_type_ref_invokestatic;
				break;
			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeVirtual :
				message = Messages.disassembler_method_type_ref_invokevirtual;
				break;
			default :
				message = Messages.disassembler_method_type_ref_newinvokespecial;
		}
		return Messages.bind(message, new String[] { Integer.toString(referenceKind) });
	}

	private void disassemble(IEnclosingMethodAttribute enclosingMethodAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
		writeNewLine(buffer, lineSeparator, tabNumber + 1);

		}
	}

	private void disassemble(IBootstrapMethodsAttribute bootstrapMethodsAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
		writeNewLine(buffer, lineSeparator, tabNumber);
		buffer.append(Messages.disassembler_bootstrapmethodattributesheader);
		writeNewLine(buffer, lineSeparator, tabNumber + 1);
		IBootstrapMethodsEntry[] entries = bootstrapMethodsAttribute.getBootstrapMethods();
		int length = entries.length;
		for (int i = 0; i < length; i++) {
			if (i != 0) {
				buffer.append(Messages.disassembler_comma);
				writeNewLine(buffer, lineSeparator, tabNumber + 1);
			}
			IBootstrapMethodsEntry entry = entries[i];
			buffer.append(
				Messages.bind(
					Messages.disassembler_bootstrapmethodentry,
					new String[] {
						Integer.toString(i),
						Integer.toString(entry.getBootstrapMethodReference()),
						getArguments(entry.getBootstrapArguments())
					}));
		}
	}

	private String getArguments(int[] arguments) {
		StringBuffer buffer = new StringBuffer();
		buffer.append('{');
		for (int i = 0, max = arguments.length; i < max; i++) {
			if (i != 0) {
				buffer.append(Messages.disassembler_comma);
			}
			buffer.append(
				Messages.bind(
					Messages.disassembler_bootstrapmethodentry_argument,
					new String[] {
						Integer.toString(arguments[i]),
					}));
		}
		buffer.append('}');
		return String.valueOf(buffer);
	}
	private void disassemble(int index, IParameterAnnotation parameterAnnotation, StringBuffer buffer, String lineSeparator, int tabNumber, int mode) {
		IAnnotation[] annotations = parameterAnnotation.getAnnotations();
		writeNewLine(buffer, lineSeparator, tabNumber + 1);

Lines 259-264 public final class Messages extends NLS { Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java (+16 lines)
259	public static String disassembler_inner_accessflags;	259	public static String disassembler_inner_accessflags;
260	public static String disassembler_genericattributeheader;	260	public static String disassembler_genericattributeheader;
261	public static String disassembler_signatureattributeheader;	261	public static String disassembler_signatureattributeheader;
		262	public static String disassembler_bootstrapmethodattributesheader;
		263	public static String disassembler_bootstrapmethodentry;
		264	public static String disassembler_bootstrapmethodentry_argument;
262	public static String disassembler_indentation;	265	public static String disassembler_indentation;
263	public static String disassembler_constantpoolindex;	266	public static String disassembler_constantpoolindex;
264	public static String disassembler_space;	267	public static String disassembler_space;
Lines 278-283 public final class Messages extends NLS { Link Here
278	public static String disassembler_constantpool_methodref;	281	public static String disassembler_constantpool_methodref;
279	public static String disassembler_constantpool_name_and_type;	282	public static String disassembler_constantpool_name_and_type;
280	public static String disassembler_constantpool_utf8;	283	public static String disassembler_constantpool_utf8;
		284	public static String disassembler_constantpool_methodhandle;
		285	public static String disassembler_constantpool_methodtype;
		286	public static String disassembler_constantpool_invokedynamic;
281	public static String disassembler_annotationdefaultheader;	287	public static String disassembler_annotationdefaultheader;
282	public static String disassembler_annotationdefaultvalue;	288	public static String disassembler_annotationdefaultvalue;
283	public static String disassembler_annotationenumvalue;	289	public static String disassembler_annotationenumvalue;
Lines 348-353 public final class Messages extends NLS { Link Here
348	public static String disassembler_frame_same_frame;	354	public static String disassembler_frame_same_frame;
349	public static String disassembler_frame_same_locals_1_stack_item;	355	public static String disassembler_frame_same_locals_1_stack_item;
350	public static String code_assist_internal_error;	356	public static String code_assist_internal_error;
		357
		358	public static String disassembler_method_type_ref_getfield;
		359	public static String disassembler_method_type_ref_putfield;
		360	public static String disassembler_method_type_ref_getstatic;
		361	public static String disassembler_method_type_ref_putstatic;
		362	public static String disassembler_method_type_ref_invokestatic;
		363	public static String disassembler_method_type_ref_invokevirtual;
		364	public static String disassembler_method_type_ref_invokespecial;
		365	public static String disassembler_method_type_ref_invokeinterface;
		366	public static String disassembler_method_type_ref_newinvokespecial;
351		367
352	static {	368	static {
353	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	369	NLS.initializeMessages(BUNDLE_NAME, Messages.class);

Lines 285-290 disassembler_genericattributeheader = Attribute: {0} Length: {1} Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties (-1 / +16 lines)
285	disassembler_stackmaptableattributeheader = Stack map table: number of frames {0}	285	disassembler_stackmaptableattributeheader = Stack map table: number of frames {0}
286	disassembler_stackmapattributeheader = Stack map : number of frames {0}	286	disassembler_stackmapattributeheader = Stack map : number of frames {0}
287	disassembler_signatureattributeheader = // Signature: {0}	287	disassembler_signatureattributeheader = // Signature: {0}
		288	disassembler_bootstrapmethodattributesheader = Bootstrap methods:
		289	disassembler_bootstrapmethodentry = {0} : # {1} arguments: {2}
		290	disassembler_bootstrapmethodentry_argument = #{0}
288	disassembler_indentation = \	291	disassembler_indentation = \
289	disassembler_constantpoolindex =\ #	292	disassembler_constantpoolindex =\ #
290	disassembler_space = \	293	disassembler_space = \
Lines 304-309 disassembler_constantpool_interfacemethodref = constant #{0} interface_method_re Link Here
304	disassembler_constantpool_methodref = constant #{0} method_ref: #{1}.#{2} {3}.{4} {5}	307	disassembler_constantpool_methodref = constant #{0} method_ref: #{1}.#{2} {3}.{4} {5}
305	disassembler_constantpool_name_and_type = constant #{0} name_and_type: #{1}.#{2} {3} {4}	308	disassembler_constantpool_name_and_type = constant #{0} name_and_type: #{1}.#{2} {3} {4}
306	disassembler_constantpool_utf8 = constant #{0} utf8: "{1}"	309	disassembler_constantpool_utf8 = constant #{0} utf8: "{1}"
		310	disassembler_constantpool_methodhandle = constant #{0} method handle: {1} #{2}
		311	disassembler_constantpool_methodtype = constant #{0} method type: #{1} {2}
		312	disassembler_constantpool_invokedynamic = constant #{0} invoke dynamic: #{1} #{2} {3} {4}
307	disassembler_annotationdefaultheader = Annotation Default:\	313	disassembler_annotationdefaultheader = Annotation Default:\
308	disassembler_annotationdefaultvalue= {0} (constant type)	314	disassembler_annotationdefaultvalue= {0} (constant type)
309	disassembler_annotationenumvalue = {2}.{3}(enum type #{0}.#{1})	315	disassembler_annotationenumvalue = {2}.{3}(enum type #{0}.#{1})
Lines 323-328 disassembler_frame_same_locals_1_stack_item_extended=[pc: {0}, same_locals_1_sta Link Here
323	disassembler_frame_chop=[pc: {0}, chop {1} local(s)]	329	disassembler_frame_chop=[pc: {0}, chop {1} local(s)]
324	disassembler_frame_same_frame_extended=[pc: {0}, same_extended]	330	disassembler_frame_same_frame_extended=[pc: {0}, same_extended]
325	disassembler_frame_append=[pc: {0}, append: {1}]	331	disassembler_frame_append=[pc: {0}, append: {1}]
		332	disassembler_method_type_ref_getfield = getfield ({0})
		333	disassembler_method_type_ref_putfield = putfield ({0})
		334	disassembler_method_type_ref_getstatic = getstatic ({0})
		335	disassembler_method_type_ref_putstatic = putstatic ({0})
		336	disassembler_method_type_ref_invokestatic = invokestatic ({0})
		337	disassembler_method_type_ref_invokevirtual = invokevirtual ({0})
		338	disassembler_method_type_ref_invokeinterface = invokeinterface ({0})
		339	disassembler_method_type_ref_invokespecial = invokespecial ({0})
		340	disassembler_method_type_ref_newinvokespecial = newinvokespecial ({0})
326	# {0} = offset delta	341	# {0} = offset delta
327	# {1} = number of locals	342	# {1} = number of locals
328	# {2} = locals	343	# {2} = locals
Lines 358-364 classformat_new = {0} {2} [{1}] Link Here
358	classformat_iinc = {0} {1} {2}{3}	373	classformat_iinc = {0} {1} {2}{3}
359	classformat_invokespecial ={0} {2} [{1}]	374	classformat_invokespecial ={0} {2} [{1}]
360	classformat_invokeinterface ={0} {3} [{1}] [nargs: {2}]	375	classformat_invokeinterface ={0} {3} [{1}] [nargs: {2}]
361	classformat_invokedynamic={0} {2} [{1}]	376	classformat_invokedynamic={0} {2} {3} [{1}]
362	classformat_invokestatic ={0} {2} [{1}]	377	classformat_invokestatic ={0} {2} [{1}]
363	classformat_invokevirtual ={0} {2} [{1}]	378	classformat_invokevirtual ={0} {2} [{1}]
364	classformat_getfield ={0} {2}.{3} : {4} [{1}]	379	classformat_getfield ={0} {2}.{3} : {4} [{1}]

Return to bug 359943

Lines 801-806 public class Disassembler extends ClassFileBytesDisassembler { Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java (-23 / +117 lines)
801	IClassFileAttribute runtimeVisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_VISIBLE_ANNOTATIONS);	801	IClassFileAttribute runtimeVisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_VISIBLE_ANNOTATIONS);
802	IClassFileAttribute runtimeInvisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS);	802	IClassFileAttribute runtimeInvisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS);
803		803
		804	IClassFileAttribute bootstrapMethods = Util.getAttribute(classFileReader, IAttributeNamesConstants.BOOTSTRAP_METHODS);
		805
804	if (checkMode(mode, DETAILED)) {	806	if (checkMode(mode, DETAILED)) {
805	// disassemble compact version of annotations	807	// disassemble compact version of annotations
806	if (runtimeInvisibleAnnotationsAttribute != null) {	808	if (runtimeInvisibleAnnotationsAttribute != null) {
Lines 904-931 public class Disassembler extends ClassFileBytesDisassembler { Link Here
904	IClassFileAttribute[] attributes = classFileReader.getAttributes();	906	IClassFileAttribute[] attributes = classFileReader.getAttributes();
905	int length = attributes.length;	907	int length = attributes.length;
906	IEnclosingMethodAttribute enclosingMethodAttribute = getEnclosingMethodAttribute(classFileReader);	908	IEnclosingMethodAttribute enclosingMethodAttribute = getEnclosingMethodAttribute(classFileReader);
907	int remainingAttributesLength = length;
908	if (innerClassesAttribute != null) {
909	remainingAttributesLength--;
910	}
911	if (enclosingMethodAttribute != null) {
912	remainingAttributesLength--;
913	}
914	if (sourceAttribute != null) {
915	remainingAttributesLength--;
916	}
917	if (signatureAttribute != null) {
918	remainingAttributesLength--;
919	}
920	if (innerClassesAttribute != null \|\| enclosingMethodAttribute != null \|\| remainingAttributesLength != 0) {
921	writeNewLine(buffer, lineSeparator, 0);
922	}
923	if (innerClassesAttribute != null) {	909	if (innerClassesAttribute != null) {
924	disassemble(innerClassesAttribute, buffer, lineSeparator, 1);	910	disassemble(innerClassesAttribute, buffer, lineSeparator, 1);
925	}	911	}
926	if (enclosingMethodAttribute != null) {	912	if (enclosingMethodAttribute != null) {
927	disassemble(enclosingMethodAttribute, buffer, lineSeparator, 0);	913	disassemble(enclosingMethodAttribute, buffer, lineSeparator, 0);
928	}	914	}
		915	if (bootstrapMethods != null) {
		916	disassemble((IBootstrapMethodsAttribute) bootstrapMethods, buffer, lineSeparator, 0);
		917	}
929	if (checkMode(mode, SYSTEM)) {	918	if (checkMode(mode, SYSTEM)) {
930	if (runtimeVisibleAnnotationsAttribute != null) {	919	if (runtimeVisibleAnnotationsAttribute != null) {
931	disassemble((IRuntimeVisibleAnnotationsAttribute) runtimeVisibleAnnotationsAttribute, buffer, lineSeparator, 0, mode);	920	disassemble((IRuntimeVisibleAnnotationsAttribute) runtimeVisibleAnnotationsAttribute, buffer, lineSeparator, 0, mode);
Lines 937-949 public class Disassembler extends ClassFileBytesDisassembler { Link Here
937	for (int i = 0; i < length; i++) {	926	for (int i = 0; i < length; i++) {
938	IClassFileAttribute attribute = attributes[i];	927	IClassFileAttribute attribute = attributes[i];
939	if (attribute != innerClassesAttribute	928	if (attribute != innerClassesAttribute
940	&& attribute != sourceAttribute	929	&& attribute != sourceAttribute
941	&& attribute != signatureAttribute	930	&& attribute != signatureAttribute
942	&& attribute != enclosingMethodAttribute	931	&& attribute != enclosingMethodAttribute
943	&& attribute != runtimeInvisibleAnnotationsAttribute	932	&& attribute != runtimeInvisibleAnnotationsAttribute
944	&& attribute != runtimeVisibleAnnotationsAttribute	933	&& attribute != runtimeVisibleAnnotationsAttribute
945	&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.DEPRECATED)	934	&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.DEPRECATED)
946	&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.SYNTHETIC)) {	935	&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.SYNTHETIC)
		936	&& attribute != bootstrapMethods) {
947	disassemble(attribute, buffer, lineSeparator, 0, mode);	937	disassemble(attribute, buffer, lineSeparator, 0, mode);
948	}	938	}
949	}	939	}
Lines 1408-1416 public class Disassembler extends ClassFileBytesDisassembler { Link Here
1408	Integer.toString(i),	1398	Integer.toString(i),
1409	decodeStringValue(new String(constantPoolEntry.getUtf8Value()))}));	1399	decodeStringValue(new String(constantPoolEntry.getUtf8Value()))}));
1410	break;	1400	break;
		1401	case IConstantPoolConstant.CONSTANT_MethodHandle :
		1402	IConstantPoolEntry2 entry2 = (IConstantPoolEntry2) constantPoolEntry;
		1403	buffer.append(
		1404	Messages.bind(Messages.disassembler_constantpool_methodhandle,
		1405	new String[] {
		1406	Integer.toString(i),
		1407	getReferenceKind(entry2.getReferenceKind()),
		1408	Integer.toString(entry2.getReferenceIndex()),
		1409	}));
		1410	break;
		1411	case IConstantPoolConstant.CONSTANT_MethodType :
		1412	entry2 = (IConstantPoolEntry2) constantPoolEntry;
		1413	buffer.append(
		1414	Messages.bind(Messages.disassembler_constantpool_methodtype,
		1415	new String[] {
		1416	Integer.toString(i),
		1417	Integer.toString(entry2.getDescriptorIndex()),
		1418	String.valueOf(entry2.getMethodDescriptor()),
		1419	}));
		1420	break;
		1421	case IConstantPoolConstant.CONSTANT_InvokeDynamic :
		1422	entry2 = (IConstantPoolEntry2) constantPoolEntry;
		1423	buffer.append(
		1424	Messages.bind(Messages.disassembler_constantpool_invokedynamic,
		1425	new String[] {
		1426	Integer.toString(i),
		1427	Integer.toString(entry2.getBootstrapMethodAttributeIndex()),
		1428	Integer.toString(entry2.getNameAndTypeIndex()),
		1429	new String(constantPoolEntry.getMethodName()),
		1430	new String(constantPoolEntry.getMethodDescriptor())
		1431	}));
1411	}	1432	}
1412	}	1433	}
1413	}	1434	}
		1435
		1436	private String getReferenceKind(int referenceKind) {
		1437	String message = null;
		1438	switch(referenceKind) {
		1439	case IConstantPoolConstant.METHOD_TYPE_REF_GetField :
		1440	message = Messages.disassembler_method_type_ref_getfield;
		1441	break;
		1442	case IConstantPoolConstant.METHOD_TYPE_REF_GetStatic :
		1443	message = Messages.disassembler_method_type_ref_getstatic;
		1444	break;
		1445	case IConstantPoolConstant.METHOD_TYPE_REF_PutField :
		1446	message = Messages.disassembler_method_type_ref_putfield;
		1447	break;
		1448	case IConstantPoolConstant.METHOD_TYPE_REF_PutStatic :
		1449	message = Messages.disassembler_method_type_ref_putstatic;
		1450	break;
		1451	case IConstantPoolConstant.METHOD_TYPE_REF_InvokeInterface :
		1452	message = Messages.disassembler_method_type_ref_invokeinterface;
		1453	break;
		1454	case IConstantPoolConstant.METHOD_TYPE_REF_InvokeSpecial :
		1455	message = Messages.disassembler_method_type_ref_invokespecial;
		1456	break;
		1457	case IConstantPoolConstant.METHOD_TYPE_REF_InvokeStatic :
		1458	message = Messages.disassembler_method_type_ref_invokestatic;
		1459	break;
		1460	case IConstantPoolConstant.METHOD_TYPE_REF_InvokeVirtual :
		1461	message = Messages.disassembler_method_type_ref_invokevirtual;
		1462	break;
		1463	default :
		1464	message = Messages.disassembler_method_type_ref_newinvokespecial;
		1465	}
		1466	return Messages.bind(message, new String[] { Integer.toString(referenceKind) });
		1467	}
1414		1468
1415	private void disassemble(IEnclosingMethodAttribute enclosingMethodAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {	1469	private void disassemble(IEnclosingMethodAttribute enclosingMethodAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
1416	writeNewLine(buffer, lineSeparator, tabNumber + 1);	1470	writeNewLine(buffer, lineSeparator, tabNumber + 1);
Lines 1669-1674 public class Disassembler extends ClassFileBytesDisassembler { Link Here
1669	}	1723	}
1670	}	1724	}
1671		1725
		1726	private void disassemble(IBootstrapMethodsAttribute bootstrapMethodsAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
		1727	writeNewLine(buffer, lineSeparator, tabNumber);
		1728	buffer.append(Messages.disassembler_bootstrapmethodattributesheader);
		1729	writeNewLine(buffer, lineSeparator, tabNumber + 1);
		1730	IBootstrapMethodsEntry[] entries = bootstrapMethodsAttribute.getBootstrapMethods();
		1731	int length = entries.length;
		1732	for (int i = 0; i < length; i++) {
		1733	if (i != 0) {
		1734	buffer.append(Messages.disassembler_comma);
		1735	writeNewLine(buffer, lineSeparator, tabNumber + 1);
		1736	}
		1737	IBootstrapMethodsEntry entry = entries[i];
		1738	buffer.append(
		1739	Messages.bind(
		1740	Messages.disassembler_bootstrapmethodentry,
		1741	new String[] {
		1742	Integer.toString(i),
		1743	Integer.toString(entry.getBootstrapMethodReference()),
		1744	getArguments(entry.getBootstrapArguments())
		1745	}));
		1746	}
		1747	}
		1748
		1749	private String getArguments(int[] arguments) {
		1750	StringBuffer buffer = new StringBuffer();
		1751	buffer.append('{');
		1752	for (int i = 0, max = arguments.length; i < max; i++) {
		1753	if (i != 0) {
		1754	buffer.append(Messages.disassembler_comma);
		1755	}
		1756	buffer.append(
		1757	Messages.bind(
		1758	Messages.disassembler_bootstrapmethodentry_argument,
		1759	new String[] {
		1760	Integer.toString(arguments[i]),
		1761	}));
		1762	}
		1763	buffer.append('}');
		1764	return String.valueOf(buffer);
		1765	}
1672	private void disassemble(int index, IParameterAnnotation parameterAnnotation, StringBuffer buffer, String lineSeparator, int tabNumber, int mode) {	1766	private void disassemble(int index, IParameterAnnotation parameterAnnotation, StringBuffer buffer, String lineSeparator, int tabNumber, int mode) {
1673	IAnnotation[] annotations = parameterAnnotation.getAnnotations();	1767	IAnnotation[] annotations = parameterAnnotation.getAnnotations();
1674	writeNewLine(buffer, lineSeparator, tabNumber + 1);	1768	writeNewLine(buffer, lineSeparator, tabNumber + 1);

Added Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsAttribute.java (+40 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.core.util;
12
13	/**
14	* Description of a bootstrap methods attribute as described in the JVM specifications.
15	*
16	* This interface may be implemented by clients.
17	*
18	* @since 3.8
19	*/
20	public interface IBootstrapMethodsAttribute extends IClassFileAttribute {
21
22	/**
23	* Answer back the number of bootstrap methods of this entry as specified in
24	* the JVM specifications.
25	*
26	* @return the local variable table length of this entry as specified in
27	* the JVM specifications
28	*/
29	int getBootstrapMethodsLength();
30
31	/**
32	* Answer back the bootstrap methods table of this entry as specified in
33	* the JVM specifications. Answer an empty array if none.
34	*
35	* @return the bootstrap methods table of this entry as specified in
36	* the JVM specifications. Answer an empty array if none
37	*/
38	IBootstrapMethodsEntry[] getBootstrapMethods();
39
40	}