Mercurial > hg > graal-compiler
view src/share/vm/ci/ciArrayKlass.cpp @ 18036:00cf2b6f51b9 hs25.20-b23
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 | d8ce2825b193 |
children |
line wrap: on
line source
/* * Copyright (c) 1999, 2012, 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. * */ #include "precompiled.hpp" #include "ci/ciArrayKlass.hpp" #include "ci/ciObjArrayKlass.hpp" #include "ci/ciTypeArrayKlass.hpp" #include "ci/ciUtilities.hpp" // ciArrayKlass // // This class represents a Klass* in the HotSpot virtual machine // whose Klass part in an ArrayKlass. // ------------------------------------------------------------------ // ciArrayKlass::ciArrayKlass // // Loaded array klass. ciArrayKlass::ciArrayKlass(KlassHandle h_k) : ciKlass(h_k) { assert(get_Klass()->oop_is_array(), "wrong type"); _dimension = get_ArrayKlass()->dimension(); } // ------------------------------------------------------------------ // ciArrayKlass::ciArrayKlass // // Unloaded array klass. ciArrayKlass::ciArrayKlass(ciSymbol* name, int dimension, BasicType bt) : ciKlass(name, bt) { _dimension = dimension; } // ------------------------------------------------------------------ // ciArrayKlass::element_type // // What type is obtained when this array is indexed once? ciType* ciArrayKlass::element_type() { if (is_type_array_klass()) { return ciType::make(as_type_array_klass()->element_type()); } else { return as_obj_array_klass()->element_klass()->as_klass(); } } // ------------------------------------------------------------------ // ciArrayKlass::base_element_type // // What type is obtained when this array is indexed as many times as possible? ciType* ciArrayKlass::base_element_type() { if (is_type_array_klass()) { return ciType::make(as_type_array_klass()->element_type()); } else { ciKlass* ek = as_obj_array_klass()->base_element_klass(); if (ek->is_type_array_klass()) { return ciType::make(ek->as_type_array_klass()->element_type()); } return ek; } } // ------------------------------------------------------------------ // ciArrayKlass::is_leaf_type bool ciArrayKlass::is_leaf_type() { if (is_type_array_klass()) { return true; } else { return as_obj_array_klass()->base_element_klass()->is_leaf_type(); } } // ------------------------------------------------------------------ // ciArrayKlass::base_element_type // // What type is obtained when this array is indexed as many times as possible? ciArrayKlass* ciArrayKlass::make(ciType* element_type) { if (element_type->is_primitive_type()) { return ciTypeArrayKlass::make(element_type->basic_type()); } else { return ciObjArrayKlass::make(element_type->as_klass()); } }