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

8143317: jdk/lambda/vm/InterfaceAccessFlagsTest.java fails with IncompatibleClassChangeError

Browse Source 
ClassToInterfaceConverter.java converts class to interface without changing corresponding method tag to interface method tag. This leads failure after 8145148.

Reviewed-by: psandoz, hseigel
This commit is contained in:
Yumin Qi 2016-01-15 08:53:23 -08:00
parent e253422eff
commit 3c46c9ce90
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jdk/test/jdk/lambda/separate/ClassToInterfaceConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -62,6 +62,25 @@ public class ClassToInterfaceConverter implements ClassFilePreprocessor {
} }
} }
cf.methods = new_methods; cf.methods = new_methods;
// Convert method tag. Find Methodref, which is not "<init>" and only invoked by other methods
// in the interface, convert it to InterfaceMethodref
ArrayList<ClassFile.CpEntry> cpool = new ArrayList<>();
for (int i = 0; i < cf.constant_pool.size(); i++) {
ClassFile.CpEntry ce = cf.constant_pool.get(i);
if (ce instanceof ClassFile.CpMethodRef) {
ClassFile.CpMethodRef me = (ClassFile.CpMethodRef)ce;
ClassFile.CpNameAndType nameType = (ClassFile.CpNameAndType)cf.constant_pool.get(me.name_and_type_index);
ClassFile.CpEntry name = cf.constant_pool.get(nameType.name_index);
if (!utf8Matches(name, "<init>") && cf.this_class == me.class_index) {
ClassFile.CpInterfaceMethodRef newEntry = new ClassFile.CpInterfaceMethodRef();
newEntry.class_index = me.class_index;
newEntry.name_and_type_index = me.name_and_type_index;
ce = newEntry;
}
}
cpool.add(ce);
}
cf.constant_pool = cpool;
} }
public byte[] preprocess(String classname, byte[] bytes) { public byte[] preprocess(String classname, byte[] bytes) {