Mercurial > hg > truffle
annotate test/compiler/stable/StableConfiguration.java @ 20228:f72d8917322a
8050978: Fix bad field access check in C1 and C2
Summary: JCK8 test vm/constantpool/accessControl/accessControl004/accessControl00402m3/accessControl00402m3.html fails with -Xbatch -Xcomp due to bad field access check in C1 and C2. Fix: In ciField::ciField(), just before the canonical holder is stored into the _holder variable (and which is used by ciField::will_link()) perform an additional access check with the holder declared in the class file. If this check fails, store the declared holder instead and ciField::will_link() will bail out compilation for this field later on. Then, the interpreter will throw an PrivilegedAccessException at runtime.
Reviewed-by: kvn, vlivanov
Contributed-by: andreas.schoesser@sap.com
author | goetz |
---|---|
date | Fri, 18 Jul 2014 09:04:01 +0200 |
parents | 5fbeae2a02d3 |
children |
rev | line source |
---|---|
20199
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
1 /* |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
2 * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
4 * |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
5 * This code is free software; you can redistribute it and/or modify it |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
6 * under the terms of the GNU General Public License version 2 only, as |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
7 * published by the Free Software Foundation. Oracle designates this |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
8 * particular file as subject to the "Classpath" exception as provided |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
9 * by Oracle in the LICENSE file that accompanied this code. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
10 * |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
11 * This code is distributed in the hope that it will be useful, but WITHOUT |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
12 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
14 * version 2 for more details (a copy is included in the LICENSE file that |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
15 * accompanied this code). |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
16 * |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
17 * You should have received a copy of the GNU General Public License version |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
18 * 2 along with this work; if not, write to the Free Software Foundation, |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
19 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
20 * |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
22 * or visit www.oracle.com if you need additional information or have any |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
23 * questions. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
24 */ |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
25 package java.lang.invoke; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
26 |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
27 import java.lang.reflect.Method; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
28 import java.util.Properties; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
29 import sun.hotspot.WhiteBox; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
30 |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
31 public class StableConfiguration { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
32 static final WhiteBox WB = WhiteBox.getWhiteBox(); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
33 static final boolean isStableEnabled; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
34 static final boolean isServerWithStable; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
35 |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
36 static { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
37 Boolean value = WB.getBooleanVMFlag("FoldStableValues"); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
38 isStableEnabled = (value == null ? false : value); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
39 isServerWithStable = isStableEnabled && get(); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
40 System.out.println("@Stable: " + (isStableEnabled ? "enabled" : "disabled")); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
41 System.out.println("Server Compiler: " + get()); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
42 } |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
43 |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
44 // ::get() is among immediately compiled methods. |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
45 static boolean get() { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
46 try { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
47 Method m = StableConfiguration.class.getDeclaredMethod("get"); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
48 int level = WB.getMethodCompilationLevel(m); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
49 if (level > 0) { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
50 return (level == 4); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
51 } else { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
52 String javaVM = System.getProperty("java.vm.name", ""); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
53 if (javaVM.contains("Server")) return true; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
54 if (javaVM.contains("Client")) return false; |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
55 throw new Error("Unknown VM type: "+javaVM); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
56 } |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
57 } catch (NoSuchMethodException e) { |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
58 throw new Error(e); |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
59 } |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
60 } |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
61 |
5fbeae2a02d3
8043546: C1 optimizes @Stable instance fields with default values
vlivanov
parents:
diff
changeset
|
62 } |