# HG changeset patch # User Bernhard Urban # Date 1371678416 -7200 # Node ID 672e126cf99628060babf89531312877bf9a73de # Parent ac79c138e734caa45bd1e1066a9632e144fa664c aot verify: s/AheadOfTimeVerifcationPhase/AheadOfTimeVerificationPhase/g diff -r ac79c138e734 -r 672e126cf996 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Jun 19 23:46:55 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Jun 19 23:46:56 2013 +0200 @@ -1077,7 +1077,7 @@ // lowering introduces class constants, therefore it must be after lowering ret.getHighTier().appendPhase(new LoadJavaMirrorWithKlassPhase()); if (VerifyPhases.getValue()) { - ret.getHighTier().appendPhase(new AheadOfTimeVerifcationPhase()); + ret.getHighTier().appendPhase(new AheadOfTimeVerificationPhase()); } } diff -r ac79c138e734 -r 672e126cf996 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerifcationPhase.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerifcationPhase.java Wed Jun 19 23:46:55 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * 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. - * - * 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. - */ -package com.oracle.graal.hotspot.phases; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; - -/** - * Checking for embedded oops in the graph. (Interned) Strings are an exception as they live in CDS - * space. - * - * @see LoadJavaMirrorWithKlassPhase - */ -public class AheadOfTimeVerifcationPhase extends VerifyPhase { - - @Override - protected boolean verify(StructuredGraph graph) { - for (ConstantNode node : graph.getNodes().filter(ConstantNode.class)) { - assert !isOop(node) || isNullReference(node) || isString(node) : "embedded oop: " + node; - } - return true; - } - - private static boolean isOop(ConstantNode node) { - return node.kind() == Kind.Object; - } - - private static boolean isNullReference(ConstantNode node) { - return isOop(node) && node.asConstant().asObject() == null; - } - - private static boolean isString(ConstantNode node) { - return isOop(node) && node.asConstant().asObject() instanceof String; - } -} diff -r ac79c138e734 -r 672e126cf996 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Wed Jun 19 23:46:56 2013 +0200 @@ -0,0 +1,56 @@ +/* + * 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. + * + * 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. + */ +package com.oracle.graal.hotspot.phases; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.phases.*; + +/** + * Checking for embedded oops in the graph. (Interned) Strings are an exception as they live in CDS + * space. + * + * @see LoadJavaMirrorWithKlassPhase + */ +public class AheadOfTimeVerificationPhase extends VerifyPhase { + + @Override + protected boolean verify(StructuredGraph graph) { + for (ConstantNode node : graph.getNodes().filter(ConstantNode.class)) { + assert !isOop(node) || isNullReference(node) || isString(node) : "embedded oop: " + node; + } + return true; + } + + private static boolean isOop(ConstantNode node) { + return node.kind() == Kind.Object; + } + + private static boolean isNullReference(ConstantNode node) { + return isOop(node) && node.asConstant().asObject() == null; + } + + private static boolean isString(ConstantNode node) { + return isOop(node) && node.asConstant().asObject() instanceof String; + } +}