stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8255757: Javac emits duplicate pool entries on array::clone

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Guoxiong Li 2021-01-05 22:21:19 +00:00 committed by Vicente Romero
parent cf9908b437
commit 7d769663b3
2 changed files with 120 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2021, 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
@ -25,6 +25,9 @@
package com.sun.tools.javac.jvm;
import java.util.HashMap;
import java.util.Map;
import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
import com.sun.tools.javac.tree.TreeInfo.PosKind;
import com.sun.tools.javac.util.*;
@ -127,6 +130,7 @@ public class Gen extends JCTree.Visitor {
// ignore cldc because we cannot have both stackmap formats
this.stackMap = StackMapFormat.JSR202;
annotate = Annotate.instance(context);
qualifiedSymbolCache = new HashMap<>();
}
/** Switches
@ -168,6 +172,12 @@ public class Gen extends JCTree.Visitor {
List<LocalItem> stackBeforeSwitchExpression;
LocalItem switchResult;
/** Cache the symbol to reflect the qualifying type.
* key: corresponding type
* value: qualified symbol
*/
Map<Type, Symbol> qualifiedSymbolCache;
/** Generate code to load an integer constant.
* @param n The integer to be loaded.
*/
@ -230,8 +240,11 @@ public class Gen extends JCTree.Visitor {
sym.owner != syms.arrayClass)
return sym;
// array clone can be qualified by the array type in later targets
Symbol qualifier = new ClassSymbol(Flags.PUBLIC, site.tsym.name,
site, syms.noSymbol);
Symbol qualifier;
if ((qualifier = qualifiedSymbolCache.get(site)) == null) {
qualifier = new ClassSymbol(Flags.PUBLIC, site.tsym.name, site, syms.noSymbol);
qualifiedSymbolCache.put(site, qualifier);
}
return sym.clone(qualifier);
}
@ -2414,6 +2427,7 @@ public class Gen extends JCTree.Visitor {
toplevel = null;
endPosTable = null;
nerrs = 0;
qualifiedSymbolCache.clear();
}
}

103
test/langtools/tools/javac/classfiles/T8255757/T8255757.java Normal file
View File

@ -0,0 +1,103 @@
/*
* Copyright (c) 2020, 2021, 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.
*
* 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.
*/
/*
* @test
* @bug 8255757
* @summary Javac shouldn't emit duplicate pool entries on array::clone
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.classfile
* @build toolbox.ToolBox toolbox.JavacTask
* @run main T8255757
*/
import java.nio.file.Path;
import com.sun.tools.classfile.ClassFile;
import com.sun.tools.classfile.ConstantPool;
import com.sun.tools.classfile.ConstantPool.*;
import toolbox.JavacTask;
import toolbox.ToolBox;
import toolbox.TestRunner;
public class T8255757 extends TestRunner {
ToolBox tb;
T8255757() {
super(System.err);
tb = new ToolBox();
}
public static void main(String[] args) throws Exception {
T8255757 t = new T8255757();
t.runTests();
}
@Test
public void testDuplicatePoolEntries() throws Exception {
String code = """
public class Test {
void test(Object[] o) {
o.clone();
o.clone();
}
void test2(Object[] o) {
o.clone();
o.clone();
}
}""";
Path curPath = Path.of(".");
new JavacTask(tb)
.sources(code)
.outdir(curPath)
.run();
ClassFile cf = ClassFile.read(curPath.resolve("Test.class"));
ConstantPool cp = cf.constant_pool;
int num = 0;
for (CPInfo cpInfo : cp.entries()) {
if (cpInfo instanceof CONSTANT_Methodref_info) {
int class_index = ((CONSTANT_Methodref_info) cpInfo).class_index;
int name_and_type_index = ((CONSTANT_Methodref_info) cpInfo).name_and_type_index;
int class_name_index = ((CONSTANT_Class_info)
cp.getClassInfo(class_index)).name_index;
int method_name_index = ((CONSTANT_NameAndType_info)
cp.getNameAndTypeInfo(name_and_type_index)).name_index;
int method_type_name_index = ((CONSTANT_NameAndType_info)
cp.getNameAndTypeInfo(name_and_type_index)).type_index;
if ("[Ljava/lang/Object;".equals(cp.getUTF8Value(class_name_index)) &&
"clone".equals(cp.getUTF8Value(method_name_index)) &&
"()Ljava/lang/Object;".equals(cp.getUTF8Value(method_type_name_index))) {
++num;
}
}
}
if (num != 1) {
throw new AssertionError("The number of the pool entries on array::clone is not right. " +
"Expected number: 1, actual number: " + num);
}
}
}