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

7165659: javac incorrectly sets strictfp access flag on inner-classes

Browse Source 
Reviewed-by: jjg, mcimadamore
This commit is contained in:
Vicente Romero 2013-06-04 13:21:41 +01:00
parent 5d6029baac
commit aeb1c4b67e
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
View File

@ -1024,6 +1024,7 @@ public class ClassWriter extends ClassFile {
char flags = (char) adjustFlags(inner.flags_field);
if ((flags & INTERFACE) != 0) flags |= ABSTRACT; // Interfaces are always ABSTRACT
if (inner.name.isEmpty()) flags &= ~FINAL; // Anonymous class: unset FINAL flag
flags &= ~STRICTFP; //inner classes should not have the strictfp flag set.
if (dumpInnerClassModifiers) {
PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
pw.println("INNERCLASS " + inner.name);

71
langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7165659
* @summary javac incorrectly sets strictfp access flag on inner-classes
*/
import java.io.File;
import com.sun.tools.classfile.AccessFlags;
import com.sun.tools.classfile.Attribute;
import com.sun.tools.classfile.ClassFile;
import com.sun.tools.classfile.InnerClasses_attribute;
import com.sun.tools.classfile.InnerClasses_attribute.Info;
import com.sun.tools.javac.util.Assert;
public class InnerClassAttrMustNotHaveStrictFPFlagTest {
public static void main(String[] args) throws Exception {
new InnerClassAttrMustNotHaveStrictFPFlagTest().run();
}
private void run() throws Exception {
File classPath = new File(System.getProperty("test.classes"), getClass().getSimpleName() + ".class");
analyzeClassFile(classPath);
}
void analyzeClassFile(File path) throws Exception {
ClassFile classFile = ClassFile.read(path);
InnerClasses_attribute innerClasses =
(InnerClasses_attribute) classFile.attributes.get(Attribute.InnerClasses);
for (Info classInfo : innerClasses.classes) {
Assert.check(!classInfo.inner_class_access_flags.is(AccessFlags.ACC_STRICT),
"Inner classes attribute must not have the ACC_STRICT flag set");
}
}
strictfp void m() {
new Runnable() {
@Override
public void run() {}
};
}
static strictfp class Strict extends InnerClassAttrMustNotHaveStrictFPFlagTest {}
}