Fri, 24 Apr 2020 03:58:51 +0100
Merge
duke@1 | 1 | /* |
ohair@554 | 2 | * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
ohair@554 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@554 | 20 | * or visit www.oracle.com if you need additional information or have any |
ohair@554 | 21 | * questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | /* |
duke@1 | 25 | * @test |
duke@1 | 26 | * @bug 4150966 4151040 4107254 4180437 |
duke@1 | 27 | * @summary General tests of strictfp changes and reflection |
duke@1 | 28 | * @author David Stoutamire (dps) |
duke@1 | 29 | * |
duke@1 | 30 | * @compile Test.java |
duke@1 | 31 | * @run main Test |
duke@1 | 32 | */ |
duke@1 | 33 | |
duke@1 | 34 | import java.lang.reflect.*; |
duke@1 | 35 | |
duke@1 | 36 | public class Test { |
duke@1 | 37 | strictfp void strict() {} |
duke@1 | 38 | strictfp class Inner2 { void strict() {} } |
duke@1 | 39 | |
duke@1 | 40 | public static void main(String[] args) throws NoSuchMethodException { |
duke@1 | 41 | assertStrict(Test.class.getDeclaredMethod("strict", new Class[0])); |
duke@1 | 42 | assertStrict(Test.Inner2.class.getDeclaredMethod("strict", new Class[0])); |
duke@1 | 43 | |
duke@1 | 44 | assertStrict(Test2.class.getDeclaredMethod("strict", new Class[0])); |
duke@1 | 45 | assertStrict(Test2.class.getDeclaredMethod("strict2", new Class[0])); |
duke@1 | 46 | assertStrict(Test2.Inner.class.getDeclaredMethod("strict", new Class[0])); |
duke@1 | 47 | assertStrict(Test2.Inner2.class.getDeclaredMethod("strict", new Class[0])); |
duke@1 | 48 | } |
duke@1 | 49 | |
duke@1 | 50 | private static void assertStrict(Method m) { |
duke@1 | 51 | int mod = m.getModifiers(); |
duke@1 | 52 | if (!Modifier.isStrict(mod)) |
duke@1 | 53 | barf(m, "strict"); |
duke@1 | 54 | } |
duke@1 | 55 | |
duke@1 | 56 | private static void barf(Method m, String msg) { |
duke@1 | 57 | System.err.println("Method "+m+" was not "+msg+": " |
duke@1 | 58 | +Modifier.toString(m.getModifiers())); |
duke@1 | 59 | |
duke@1 | 60 | } |
duke@1 | 61 | } |
duke@1 | 62 | |
duke@1 | 63 | |
duke@1 | 64 | strictfp class Test2 { |
duke@1 | 65 | void strict() {} |
duke@1 | 66 | strictfp void strict2() {} |
duke@1 | 67 | class Inner { void strict() {} } |
duke@1 | 68 | strictfp class Inner2 { void strict() {} } |
duke@1 | 69 | } |
duke@1 | 70 | |
duke@1 | 71 | // check local inner classes are accepted |
duke@1 | 72 | class OtherTest |
duke@1 | 73 | { |
duke@1 | 74 | static double m() { |
duke@1 | 75 | strictfp class Inn { |
duke@1 | 76 | float i; |
duke@1 | 77 | } |
duke@1 | 78 | return 2.0; |
duke@1 | 79 | } |
duke@1 | 80 | } |