Mercurial > hg > truffle
view src/share/vm/gc_implementation/g1/g1HRPrinter.cpp @ 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 | 78bbf4d43a14 |
children |
line wrap: on
line source
/* * Copyright (c) 2011, 2014, 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 "gc_implementation/g1/g1HRPrinter.hpp" #include "gc_implementation/g1/heapRegion.hpp" #include "utilities/ostream.hpp" PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC const char* G1HRPrinter::action_name(ActionType action) { switch(action) { case Alloc: return "ALLOC"; case AllocForce: return "ALLOC-FORCE"; case Retire: return "RETIRE"; case Reuse: return "REUSE"; case CSet: return "CSET"; case EvacFailure: return "EVAC-FAILURE"; case Cleanup: return "CLEANUP"; case PostCompaction: return "POST-COMPACTION"; case Commit: return "COMMIT"; case Uncommit: return "UNCOMMIT"; default: ShouldNotReachHere(); } // trying to keep the Windows compiler happy return NULL; } const char* G1HRPrinter::region_type_name(RegionType type) { switch (type) { case Unset: return NULL; case Eden: return "Eden"; case Survivor: return "Survivor"; case Old: return "Old"; case SingleHumongous: return "SingleH"; case StartsHumongous: return "StartsH"; case ContinuesHumongous: return "ContinuesH"; default: ShouldNotReachHere(); } // trying to keep the Windows compiler happy return NULL; } const char* G1HRPrinter::phase_name(PhaseType phase) { switch (phase) { case StartGC: return "StartGC"; case EndGC: return "EndGC"; case StartFullGC: return "StartFullGC"; case EndFullGC: return "EndFullGC"; default: ShouldNotReachHere(); } // trying to keep the Windows compiler happy return NULL; } #define G1HR_PREFIX " G1HR" void G1HRPrinter::print(ActionType action, RegionType type, HeapRegion* hr, HeapWord* top) { const char* action_str = action_name(action); const char* type_str = region_type_name(type); HeapWord* bottom = hr->bottom(); if (type_str != NULL) { if (top != NULL) { gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, action_str, type_str, bottom, top); } else { gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT, action_str, type_str, bottom); } } else { if (top != NULL) { gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT, action_str, bottom, top); } else { gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT, action_str, bottom); } } } void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { const char* action_str = action_name(action); gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", action_str, bottom, end); } void G1HRPrinter::print(PhaseType phase, size_t phase_num) { const char* phase_str = phase_name(phase); gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); }