# HG changeset patch # User asaha # Date 1249922200 25200 # Node ID 60eb7d466a84037f0f631b022259ea9f63fddbd2 # Parent 2987747b25868c7e310028896936a8bac2fe3247# Parent 5daeeb71ee784fc4bb717b0e60fb7c6b529c018d Merge diff -r 2987747b2586 -r 60eb7d466a84 .hgtags --- a/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ 7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65 62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66 eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67 +bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 .hgtags-top-repo --- a/.hgtags-top-repo Fri Aug 07 11:32:20 2009 -0700 +++ b/.hgtags-top-repo Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67 +e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 corba/.hgtags --- a/corba/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/corba/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67 +5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 hotspot/.hgtags --- a/hotspot/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/hotspot/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66 18f526145aea355a9320b724373386fc2170f183 jdk7-b67 +d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 jaxp/.hgtags --- a/jaxp/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/jaxp/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66 a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67 +83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 jaxws/.hgtags --- a/jaxws/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/jaxws/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67 +845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 jdk/.hgtags --- a/jdk/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/jdk/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67 +b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 jdk/src/windows/native/sun/jkernel/kernel.cpp --- a/jdk/src/windows/native/sun/jkernel/kernel.cpp Fri Aug 07 11:32:20 2009 -0700 +++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp Mon Aug 10 09:36:40 2009 -0700 @@ -116,11 +116,11 @@ char *result = NULL; size_t len; const jchar* utf16 = env->GetStringChars(jstr, NULL); - len = wcstombs(NULL, utf16, env->GetStringLength(jstr) * 4) + 1; + len = wcstombs(NULL, (const wchar_t*)utf16, env->GetStringLength(jstr) * 4) + 1; if (len == -1) return NULL; result = (char*) malloc(len); - if (wcstombs(result, utf16, len) == -1) + if (wcstombs(result, (const wchar_t*)utf16, len) == -1) return NULL; env->ReleaseStringChars(jstr, utf16); return result; @@ -640,7 +640,7 @@ } -void getParent(const TCHAR *path, TCHAR *dest) { +void getParent(TCHAR *path, TCHAR *dest) { char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/')); if (lastSlash == NULL) { *dest = NULL; diff -r 2987747b2586 -r 60eb7d466a84 langtools/.hgtags --- a/langtools/.hgtags Fri Aug 07 11:32:20 2009 -0700 +++ b/langtools/.hgtags Mon Aug 10 09:36:40 2009 -0700 @@ -42,3 +42,4 @@ 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66 14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67 +95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68 diff -r 2987747b2586 -r 60eb7d466a84 langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java --- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Fri Aug 07 11:32:20 2009 -0700 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Mon Aug 10 09:36:40 2009 -0700 @@ -435,7 +435,7 @@ } public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, ClassOutputStream out) { - out.writeByte(attr.local_variable_table.length); + out.writeShort(attr.local_variable_table.length); for (LocalVariableTypeTable_attribute.Entry e: attr.local_variable_table) writeLocalVariableTypeTableEntry(e, out); return null; diff -r 2987747b2586 -r 60eb7d466a84 langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java --- a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Fri Aug 07 11:32:20 2009 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Mon Aug 10 09:36:40 2009 -0700 @@ -117,7 +117,7 @@ } public void writeInstr(Instruction instr) { - print(String.format("%4d: %-12s ", instr.getPC(), instr.getMnemonic())); + print(String.format("%4d: %-13s ", instr.getPC(), instr.getMnemonic())); instr.accept(instructionPrinter, null); println(); } @@ -140,7 +140,7 @@ } public Void visitConstantPoolRef(Instruction instr, int index, Void p) { - print("#" + index + ";"); + print("#" + index); tab(); print("// "); printConstant(index); @@ -148,7 +148,7 @@ } public Void visitConstantPoolRefAndValue(Instruction instr, int index, int value, Void p) { - print("#" + index + ", " + value + ";"); + print("#" + index + ", " + value); tab(); print("// "); printConstant(index); @@ -170,7 +170,7 @@ print("{ // " + npairs); indent(+1); for (int i = 0; i < npairs; i++) { - print("\n" + matches[i] + ": " + (pc + offsets[i]) + ";"); + print("\n" + matches[i] + ": " + (pc + offsets[i])); } print("\ndefault: " + (pc + default_) + " }"); indent(-1); @@ -182,7 +182,7 @@ print("{ //" + low + " to " + high); indent(+1); for (int i = 0; i < offsets.length; i++) { - print("\n" + (low + i) + ": " + (pc + offsets[i]) + ";"); + print("\n" + (low + i) + ": " + (pc + offsets[i])); } print("\ndefault: " + (pc + default_) + " }"); indent(-1); diff -r 2987747b2586 -r 60eb7d466a84 langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java --- a/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java Fri Aug 07 11:32:20 2009 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java Mon Aug 10 09:36:40 2009 -0700 @@ -62,69 +62,69 @@ protected void writeConstantPool(ConstantPool constant_pool) { ConstantPool.Visitor v = new ConstantPool.Visitor() { public Integer visitClass(CONSTANT_Class_info info, Void p) { - print("#" + info.name_index + ";"); + print("#" + info.name_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitDouble(CONSTANT_Double_info info, Void p) { - println(stringValue(info) + ";"); + println(stringValue(info)); return 2; } public Integer visitFieldref(CONSTANT_Fieldref_info info, Void p) { - print("#" + info.class_index + ".#" + info.name_and_type_index + ";"); + print("#" + info.class_index + ".#" + info.name_and_type_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitFloat(CONSTANT_Float_info info, Void p) { - println(stringValue(info) + ";"); + println(stringValue(info)); return 1; } public Integer visitInteger(CONSTANT_Integer_info info, Void p) { - println(stringValue(info) + ";"); + println(stringValue(info)); return 1; } public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) { - print("#" + info.class_index + ".#" + info.name_and_type_index + ";"); + print("#" + info.class_index + ".#" + info.name_and_type_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitLong(CONSTANT_Long_info info, Void p) { - println(stringValue(info) + ";"); + println(stringValue(info)); return 2; } public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) { - print("#" + info.name_index + ":#" + info.type_index + ";"); + print("#" + info.name_index + ":#" + info.type_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) { - print("#" + info.class_index + ".#" + info.name_and_type_index + ";"); + print("#" + info.class_index + ".#" + info.name_and_type_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitString(CONSTANT_String_info info, Void p) { - print("#" + info.string_index + ";"); + print("#" + info.string_index); tab(); println("// " + stringValue(info)); return 1; } public Integer visitUtf8(CONSTANT_Utf8_info info, Void p) { - println(stringValue(info) + ";"); + println(stringValue(info)); return 1; } @@ -134,10 +134,10 @@ int width = String.valueOf(constant_pool.size()).length() + 1; int cpx = 1; while (cpx < constant_pool.size()) { - print(String.format("const %" + width + "s", ("#" + cpx))); + print(String.format("%" + width + "s", ("#" + cpx))); try { CPInfo cpInfo = constant_pool.get(cpx); - print(String.format(" = %-15s ", tagName(cpInfo.getTag()))); + print(String.format(" = %-18s ", cpTagName(cpInfo))); cpx += cpInfo.accept(v, null); } catch (ConstantPool.InvalidIndex ex) { // should not happen @@ -178,10 +178,15 @@ print(tagName(tag) + " " + stringValue(cpInfo)); } + String cpTagName(CPInfo cpInfo) { + String n = cpInfo.getClass().getSimpleName(); + return n.replace("CONSTANT_", "").replace("_info", ""); + } + String tagName(int tag) { switch (tag) { case CONSTANT_Utf8: - return "Asciz"; + return "Utf8"; case CONSTANT_Integer: return "int"; case CONSTANT_Float: @@ -203,7 +208,7 @@ case CONSTANT_NameAndType: return "NameAndType"; default: - return "unknown tag"; + return "(unknown tag)"; } } diff -r 2987747b2586 -r 60eb7d466a84 langtools/test/tools/javac/code/ArrayClone.java --- a/langtools/test/tools/javac/code/ArrayClone.java Fri Aug 07 11:32:20 2009 -0700 +++ b/langtools/test/tools/javac/code/ArrayClone.java Mon Aug 10 09:36:40 2009 -0700 @@ -48,7 +48,7 @@ System.out.println(out); for (String line: out.split("\n")) { - String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+;[ \t]+// Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;"; + String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+[ \t]+// Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;"; if (line.matches(match)) return; } diff -r 2987747b2586 -r 60eb7d466a84 langtools/test/tools/javap/T6868539.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javap/T6868539.java Mon Aug 10 09:36:40 2009 -0700 @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6868539 6868548 + * @summary javap should use current names for constant pool entries, + * remove spurious ';' from constant pool entries + */ + +import java.io.*; +import java.util.*; + +public class T6868539 + +{ + public static void main(String... args) { + new T6868539().run(); + } + + void run() { + verify("T6868539", "Utf8 +java/lang/String"); // 1: Utf8 + // 2: currently unused + verify("T6868539", "Integer +123456"); // 3: Integer + verify("T6868539", "Float +123456.0f"); // 4: Float + verify("T6868539", "Long +123456l"); // 5: Long + verify("T6868539", "Double +123456.0d"); // 6: Double + verify("T6868539", "Class +#[0-9]+ +// + T6868539"); // 7: Class + verify("T6868539", "String +#[0-9]+ +// + not found"); // 8: String + verify("T6868539", "Fieldref +#[0-9]+\\.#[0-9]+ +// +T6868539.errors:I"); // 9: Fieldref + verify("T6868539", "Methodref +#[0-9]+\\.#[0-9]+ +// +T6868539.run:\\(\\)V"); // 10: Methodref + verify("T6868539", "InterfaceMethodref +#[0-9]+\\.#[0-9]+ +// +java/lang/Runnable\\.run:\\(\\)V"); + // 11: InterfaceMethodref + verify("T6868539", "NameAndType +#[0-9]+:#[0-9]+ +// +run:\\(\\)V"); // 12: NameAndType + if (errors > 0) + throw new Error(errors + " found."); + } + + void verify(String className, String... expects) { + String output = javap(className); + for (String expect: expects) { + if (!output.matches("(?s).*" + expect + ".*")) + error(expect + " not found"); + } + } + + void error(String msg) { + System.err.println(msg); + errors++; + } + + int errors; + + String javap(String className) { + String testClasses = System.getProperty("test.classes", "."); + StringWriter sw = new StringWriter(); + PrintWriter out = new PrintWriter(sw); + String[] args = { "-v", "-classpath", testClasses, className }; + int rc = com.sun.tools.javap.Main.run(args, out); + if (rc != 0) + throw new Error("javap failed. rc=" + rc); + out.close(); + String output = sw.toString(); + System.out.println("class " + className); + System.out.println(output); + return output; + } + + int i = 123456; + float f = 123456.f; + double d = 123456.; + long l = 123456L; + + void m(Runnable r) { r.run(); } +} +