truffle: graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java annotate

annotate graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java @ 15470:c55f44b3c5e5

remove NodesToDoubles, refactoring of node probability and inlining relevance computation

author	Lukas Stadler <lukas.stadler@oracle.com>
date	Fri, 02 May 2014 12:02:27 +0200
parents	820c6d353358
children	5c73b162eec2

rev	line source
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	1 /*
9015 92d2bedb5dfc Change of Snippet template and instantiation process Christian Wimmer <christian.wimmer@oracle.com> parents: 8981 diff changeset	2 * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	4 *
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	5 * This code is free software; you can redistribute it and/or modify it
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	7 * published by the Free Software Foundation.
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	8 *
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	13 * accompanied this code).
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	14 *
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	15 * You should have received a copy of the GNU General Public License version
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	18 *
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	20 * or visit www.oracle.com if you need additional information or have any
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	21 * questions.
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	22 */
8415 2361bf148c06 rename packages: snippets -> replacements Doug Simon <doug.simon@oracle.com> parents: 8414 diff changeset	23 package com.oracle.graal.replacements;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	24
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	25 import static com.oracle.graal.api.meta.MetaUtil.*;
11491 a03452edfc4d made enabling/disabling of intrinsifications extensible (GRAAL-111) Doug Simon <doug.simon@oracle.com> parents: 11402 diff changeset	26 import static com.oracle.graal.compiler.GraalCompiler.*;
15259 d90e5c22ba55 Move GraalOptions to graal.compiler.common. Josef Eisl <josef.eisl@jku.at> parents: 15193 diff changeset	27 import static com.oracle.graal.compiler.common.GraalOptions.*;
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	28
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	29 import java.lang.reflect.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	30 import java.util.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	31 import java.util.concurrent.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	32
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	33 import sun.misc.*;
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	34
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	35 import com.oracle.graal.api.code.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	36 import com.oracle.graal.api.meta.*;
8420 5d3fa6f949fb created com.oracle.graal.api.replacements project and moved ClassSubstitution and MethodSubstitution there Doug Simon <doug.simon@oracle.com> parents: 8419 diff changeset	37 import com.oracle.graal.api.replacements.*;
15193 96bb07a5d667 Spit up and move GraalInternalError. Josef Eisl <josef.eisl@jku.at> parents: 15053 diff changeset	38 import com.oracle.graal.compiler.common.*;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	39 import com.oracle.graal.debug.*;
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	40 import com.oracle.graal.debug.Debug.Scope;
12714 655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	41 import com.oracle.graal.debug.internal.*;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	42 import com.oracle.graal.graph.*;
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	43 import com.oracle.graal.graph.Graph.Mark;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	44 import com.oracle.graal.java.*;
14739 553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	45 import com.oracle.graal.java.GraphBuilderPhase.Instance;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	46 import com.oracle.graal.nodes.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	47 import com.oracle.graal.nodes.java.*;
7300 2912b72d840a More complete and reusable Word type Christian Wimmer <christian.wimmer@oracle.com> parents: 7295 diff changeset	48 import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind;
8637 ce5750014c3d moved Replacements and MacroSubstitution from the graal.api.replacements project to graal.nodes project and reversed the dependency between these two projects (the latter now/again depends on the former) Doug Simon <doug.simon@oracle.com> parents: 8631 diff changeset	49 import com.oracle.graal.nodes.spi.*;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	50 import com.oracle.graal.phases.*;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	51 import com.oracle.graal.phases.common.*;
15470 c55f44b3c5e5 remove NodesToDoubles, refactoring of node probability and inlining relevance computation Lukas Stadler <lukas.stadler@oracle.com> parents: 15311 diff changeset	52 import com.oracle.graal.phases.common.inlining.*;
11569 2f6734f8126a Avoid direct usage of CanonicalizerPhase.Instance in replacements processing. Roland Schatz <roland.schatz@oracle.com> parents: 11491 diff changeset	53 import com.oracle.graal.phases.tiers.*;
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	54 import com.oracle.graal.phases.util.*;
8419 11bada5f81a6 refactored MethodSubstitution and MacroSubstitution into top level classes Doug Simon <doug.simon@oracle.com> parents: 8416 diff changeset	55 import com.oracle.graal.replacements.Snippet.DefaultSnippetInliningPolicy;
11bada5f81a6 refactored MethodSubstitution and MacroSubstitution into top level classes Doug Simon <doug.simon@oracle.com> parents: 8416 diff changeset	56 import com.oracle.graal.replacements.Snippet.SnippetInliningPolicy;
7300 2912b72d840a More complete and reusable Word type Christian Wimmer <christian.wimmer@oracle.com> parents: 7295 diff changeset	57 import com.oracle.graal.word.phases.*;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	58
8628 77de2f3df379 renames: [HotSpot]ReplacementsInstaller -> [HotSpot]ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8627 diff changeset	59 public class ReplacementsImpl implements Replacements {
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	60
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	61 protected final Providers providers;
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	62 protected final SnippetReflectionProvider snippetReflection;
8199 a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	63 protected final TargetDescription target;
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	64 protected final Assumptions assumptions;
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	65
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	66 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	67 * The preprocessed replacement graphs.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	68 */
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	69 protected final ConcurrentMap<ResolvedJavaMethod, StructuredGraph> graphs;
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	70
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	71 // These data structures are all fully initialized during single-threaded
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	72 // compiler startup and so do not need to be concurrent.
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	73 protected final Map<ResolvedJavaMethod, ResolvedJavaMethod> registeredMethodSubstitutions;
11402 7401a9c8a7bb naming cleanup Doug Simon <doug.simon@oracle.com> parents: 10903 diff changeset	74 private final Map<ResolvedJavaMethod, Class<? extends FixedWithNextNode>> registeredMacroSubstitutions;
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	75 private final Set<ResolvedJavaMethod> forcedSubstitutions;
9187 cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	76 private final Map<Class<? extends SnippetTemplateCache>, SnippetTemplateCache> snippetTemplateCache;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	77
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	78 public ReplacementsImpl(Providers providers, SnippetReflectionProvider snippetReflection, Assumptions assumptions, TargetDescription target) {
12429 5124eeec1a7b split HotSpotRuntime into separate provider implementations Doug Simon <doug.simon@oracle.com> parents: 12408 diff changeset	79 this.providers = providers.copyWith(this);
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	80 this.snippetReflection = snippetReflection;
13132 922dd1415c0a Commit pass target as a parameter to ReplacementImpl, so that it does not require a CodeCacheProvider Christian Wimmer <christian.wimmer@oracle.com> parents: 13128 diff changeset	81 this.target = target;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	82 this.assumptions = assumptions;
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	83 this.graphs = new ConcurrentHashMap<>();
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	84 this.registeredMethodSubstitutions = new HashMap<>();
11402 7401a9c8a7bb naming cleanup Doug Simon <doug.simon@oracle.com> parents: 10903 diff changeset	85 this.registeredMacroSubstitutions = new HashMap<>();
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	86 this.forcedSubstitutions = new HashSet<>();
9187 cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	87 this.snippetTemplateCache = new HashMap<>();
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	88 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	89
12706 bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false) Doug Simon <doug.simon@oracle.com> parents: 12432 diff changeset	90 private static final boolean UseSnippetGraphCache = Boolean.parseBoolean(System.getProperty("graal.useSnippetGraphCache", "true"));
12714 655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	91 private static final DebugTimer SnippetPreparationTime = Debug.timer("SnippetPreparationTime");
12706 bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false) Doug Simon <doug.simon@oracle.com> parents: 12432 diff changeset	92
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	93 public StructuredGraph getSnippet(ResolvedJavaMethod method) {
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	94 return getSnippet(method, null);
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	95 }
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	96
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	97 @Override
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	98 public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod recursiveEntry) {
9015 92d2bedb5dfc Change of Snippet template and instantiation process Christian Wimmer <christian.wimmer@oracle.com> parents: 8981 diff changeset	99 assert method.getAnnotation(Snippet.class) != null : "Snippet must be annotated with @" + Snippet.class.getSimpleName();
15311 820c6d353358 added ModifiersProvider as superinterface for ResolvedJava[Method\|Field\|Type] and implemented all checks against modifiers as default methods Doug Simon <doug.simon@oracle.com> parents: 15259 diff changeset	100 assert !method.isAbstract() && !method.isNative() : "Snippet must not be abstract or native";
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	101
12706 bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false) Doug Simon <doug.simon@oracle.com> parents: 12432 diff changeset	102 StructuredGraph graph = UseSnippetGraphCache ? graphs.get(method) : null;
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	103 if (graph == null) {
12714 655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	104 try (TimerCloseable a = SnippetPreparationTime.start()) {
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	105 FrameStateProcessing frameStateProcessing = method.getAnnotation(Snippet.class).removeAllFrameStates() ? FrameStateProcessing.Removal
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	106 : FrameStateProcessing.CollapseFrameForSingleSideEffect;
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	107 StructuredGraph newGraph = makeGraph(method, recursiveEntry, recursiveEntry, inliningPolicy(method), frameStateProcessing);
14616 aa7bcf1fa423 expanded Debug API to avoid any allocation for timer and metric creation if debugging is disabled Doug Simon <doug.simon@oracle.com> parents: 14589 diff changeset	108 Debug.metric("SnippetNodeCount[%#s]", method).add(newGraph.getNodeCount());
12745 31ed7cd96914 made SnippetGraphNodeCount count the right thing; re-enable prepared snippet graph caching by default Doug Simon <doug.simon@oracle.com> parents: 12714 diff changeset	109 if (!UseSnippetGraphCache) {
12714 655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	110 return newGraph;
655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	111 }
655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	112 graphs.putIfAbsent(method, newGraph);
655c87d8d3c2 added SnippetPreparationTime metric Doug Simon <doug.simon@oracle.com> parents: 12706 diff changeset	113 graph = graphs.get(method);
12706 bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false) Doug Simon <doug.simon@oracle.com> parents: 12432 diff changeset	114 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	115 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	116 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	117 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	118
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	119 @Override
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	120 public void registerSnippet(ResolvedJavaMethod method) {
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	121 // No initialization needed as snippet graphs are created on demand in getSnippet
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	122 }
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	123
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	124 @Override
13222 de8f74d49690 rename Replacements.prepareSnippetCopyAfterInstantiation Erik Eckstein <erik.eckstein@oracle.com> parents: 13197 diff changeset	125 public void notifyAfterConstantsBound(StructuredGraph specializedSnippet) {
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	126
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	127 // Do deferred intrinsification of node intrinsics
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	128
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	129 new NodeIntrinsificationPhase(providers, snippetReflection).apply(specializedSnippet);
13222 de8f74d49690 rename Replacements.prepareSnippetCopyAfterInstantiation Erik Eckstein <erik.eckstein@oracle.com> parents: 13197 diff changeset	130 new CanonicalizerPhase(true).apply(specializedSnippet, new PhaseContext(providers, assumptions));
de8f74d49690 rename Replacements.prepareSnippetCopyAfterInstantiation Erik Eckstein <erik.eckstein@oracle.com> parents: 13197 diff changeset	131 NodeIntrinsificationVerificationPhase.verify(specializedSnippet);
13146 ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	132 }
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	133
ffbfc3e78746 extend replacements API to support svm specific snippet handling Erik Eckstein <erik.eckstein@oracle.com> parents: 13132 diff changeset	134 @Override
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	135 public StructuredGraph getMethodSubstitution(ResolvedJavaMethod original) {
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	136 ResolvedJavaMethod substitute = registeredMethodSubstitutions.get(original);
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	137 if (substitute == null) {
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	138 return null;
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	139 }
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	140 StructuredGraph graph = graphs.get(substitute);
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	141 if (graph == null) {
13980 68ae6fae9d2e freeze graphs before inserting into table Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13977 diff changeset	142 graph = makeGraph(substitute, original, substitute, inliningPolicy(substitute), FrameStateProcessing.None);
68ae6fae9d2e freeze graphs before inserting into table Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13977 diff changeset	143 graph.freeze();
68ae6fae9d2e freeze graphs before inserting into table Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13977 diff changeset	144 graphs.putIfAbsent(substitute, graph);
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	145 graph = graphs.get(substitute);
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	146 }
13744 d96dbd96bb45 Always copy method substitutions. Add some assertion checking for it. Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13629 diff changeset	147 assert graph.isFrozen();
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	148 return graph;
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	149
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	150 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	151
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	152 public Class<? extends FixedWithNextNode> getMacroSubstitution(ResolvedJavaMethod method) {
11402 7401a9c8a7bb naming cleanup Doug Simon <doug.simon@oracle.com> parents: 10903 diff changeset	153 return registeredMacroSubstitutions.get(method);
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	154 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	155
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	156 public Assumptions getAssumptions() {
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	157 return assumptions;
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	158 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	159
13629 5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	160 private static SubstitutionGuard getGuard(Class<? extends SubstitutionGuard> guardClass) {
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	161 if (guardClass != SubstitutionGuard.class) {
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	162 try {
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	163 return guardClass.newInstance();
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	164 } catch (Exception e) {
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	165 throw new GraalInternalError(e);
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	166 }
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	167 }
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	168 return null;
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	169 }
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	170
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	171 public void registerSubstitutions(Class<?> substitutions) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	172 ClassSubstitution classSubstitution = substitutions.getAnnotation(ClassSubstitution.class);
7545 b30b33d9da80 sanity checks for SnippetInstaller.installSubstitutions() Doug Simon <doug.simon@oracle.com> parents: 7530 diff changeset	173 assert classSubstitution != null;
8413 d9347ee39fbe rename: SnippetsInterface -> Snippets Doug Simon <doug.simon@oracle.com> parents: 8410 diff changeset	174 assert !Snippets.class.isAssignableFrom(substitutions);
13629 5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	175 SubstitutionGuard defaultGuard = getGuard(classSubstitution.defaultGuard());
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	176 for (Method substituteMethod : substitutions.getDeclaredMethods()) {
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	177 MethodSubstitution methodSubstitution = substituteMethod.getAnnotation(MethodSubstitution.class);
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	178 MacroSubstitution macroSubstitution = substituteMethod.getAnnotation(MacroSubstitution.class);
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	179 if (methodSubstitution == null && macroSubstitution == null) {
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	180 continue;
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	181 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	182
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	183 int modifiers = substituteMethod.getModifiers();
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	184 if (!Modifier.isStatic(modifiers)) {
10903 d518ea24c82b added ClassIsInterfaceNode macro node Doug Simon <doug.simon@oracle.com> parents: 10707 diff changeset	185 throw new GraalInternalError("Substitution methods must be static: " + substituteMethod);
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	186 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	187
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	188 if (methodSubstitution != null) {
13629 5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	189 SubstitutionGuard guard = getGuard(methodSubstitution.guard());
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	190 if (guard == null) {
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	191 guard = defaultGuard;
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	192 }
5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	193
10903 d518ea24c82b added ClassIsInterfaceNode macro node Doug Simon <doug.simon@oracle.com> parents: 10707 diff changeset	194 if (macroSubstitution != null && macroSubstitution.isStatic() != methodSubstitution.isStatic()) {
d518ea24c82b added ClassIsInterfaceNode macro node Doug Simon <doug.simon@oracle.com> parents: 10707 diff changeset	195 throw new GraalInternalError("Macro and method substitution must agree on isStatic attribute: " + substituteMethod);
d518ea24c82b added ClassIsInterfaceNode macro node Doug Simon <doug.simon@oracle.com> parents: 10707 diff changeset	196 }
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	197 if (Modifier.isAbstract(modifiers) \|\| Modifier.isNative(modifiers)) {
10903 d518ea24c82b added ClassIsInterfaceNode macro node Doug Simon <doug.simon@oracle.com> parents: 10707 diff changeset	198 throw new GraalInternalError("Substitution method must not be abstract or native: " + substituteMethod);
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	199 }
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	200 String originalName = originalName(substituteMethod, methodSubstitution.value());
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	201 JavaSignature originalSignature = originalSignature(substituteMethod, methodSubstitution.signature(), methodSubstitution.isStatic());
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	202 Member originalMethod = originalMethod(classSubstitution, methodSubstitution.optional(), originalName, originalSignature);
13629 5348da19751d Add locally specified guards to substitutions Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13618 diff changeset	203 if (originalMethod != null && (guard == null \|\| guard.execute())) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	204 ResolvedJavaMethod original = registerMethodSubstitution(originalMethod, substituteMethod);
11491 a03452edfc4d made enabling/disabling of intrinsifications extensible (GRAAL-111) Doug Simon <doug.simon@oracle.com> parents: 11402 diff changeset	205 if (original != null && methodSubstitution.forced() && shouldIntrinsify(original)) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	206 forcedSubstitutions.add(original);
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	207 }
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	208 }
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	209 }
14589 90b43a808eb0 use lazy names for snippet and replacements related debug values Doug Simon <doug.simon@oracle.com> parents: 14160 diff changeset	210 // We don't have per method guards for macro substitutions but at
90b43a808eb0 use lazy names for snippet and replacements related debug values Doug Simon <doug.simon@oracle.com> parents: 14160 diff changeset	211 // least respect the defaultGuard if there is one.
13977 39076a984c33 lower arraycopy calls later and support unchecked object arraycopy Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13744 diff changeset	212 if (macroSubstitution != null && (defaultGuard == null \|\| defaultGuard.execute())) {
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	213 String originalName = originalName(substituteMethod, macroSubstitution.value());
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	214 JavaSignature originalSignature = originalSignature(substituteMethod, macroSubstitution.signature(), macroSubstitution.isStatic());
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	215 Member originalMethod = originalMethod(classSubstitution, macroSubstitution.optional(), originalName, originalSignature);
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	216 if (originalMethod != null) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	217 ResolvedJavaMethod original = registerMacroSubstitution(originalMethod, macroSubstitution.macro());
11491 a03452edfc4d made enabling/disabling of intrinsifications extensible (GRAAL-111) Doug Simon <doug.simon@oracle.com> parents: 11402 diff changeset	218 if (original != null && macroSubstitution.forced() && shouldIntrinsify(original)) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	219 forcedSubstitutions.add(original);
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	220 }
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	221 }
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	222 }
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	223 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	224 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	225
7373 6b2c55fc9ba8 reworked mechanism for omitting intrinsics if the underlying hardware support is not available and used it to make intrinsification of Integer.bitCount() dependent on whether the POPCNT instruction is available Doug Simon <doug.simon@oracle.com> parents: 7360 diff changeset	226 /**
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	227 * Registers a method substitution.
15002 06e50d290784 isAllowedUsageType on Nodes Lukas Stadler <lukas.stadler@oracle.com> parents: 14908 diff changeset	228 *
8431 be5ce3e9d473 rename: originalMethod -> originalMember Doug Simon <doug.simon@oracle.com> parents: 8430 diff changeset	229 * @param originalMember a method or constructor being substituted
7373 6b2c55fc9ba8 reworked mechanism for omitting intrinsics if the underlying hardware support is not available and used it to make intrinsification of Integer.bitCount() dependent on whether the POPCNT instruction is available Doug Simon <doug.simon@oracle.com> parents: 7360 diff changeset	230 * @param substituteMethod the substitute method
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	231 * @return the original method
7373 6b2c55fc9ba8 reworked mechanism for omitting intrinsics if the underlying hardware support is not available and used it to make intrinsification of Integer.bitCount() dependent on whether the POPCNT instruction is available Doug Simon <doug.simon@oracle.com> parents: 7360 diff changeset	232 */
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	233 protected ResolvedJavaMethod registerMethodSubstitution(Member originalMember, Method substituteMethod) {
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	234 MetaAccessProvider metaAccess = providers.getMetaAccess();
11959 23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 11870 diff changeset	235 ResolvedJavaMethod substitute = metaAccess.lookupJavaMethod(substituteMethod);
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	236 ResolvedJavaMethod original;
8431 be5ce3e9d473 rename: originalMethod -> originalMember Doug Simon <doug.simon@oracle.com> parents: 8430 diff changeset	237 if (originalMember instanceof Method) {
11959 23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 11870 diff changeset	238 original = metaAccess.lookupJavaMethod((Method) originalMember);
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	239 } else {
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	240 original = metaAccess.lookupJavaConstructor((Constructor<?>) originalMember);
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	241 }
14636 733e50d96f9b fixed usages of Debug.log() Doug Simon <doug.simon@oracle.com> parents: 14616 diff changeset	242 if (Debug.isLogEnabled()) {
733e50d96f9b fixed usages of Debug.log() Doug Simon <doug.simon@oracle.com> parents: 14616 diff changeset	243 Debug.log("substitution: %s --> %s", MetaUtil.format("%H.%n(%p) %r", original), MetaUtil.format("%H.%n(%p) %r", substitute));
733e50d96f9b fixed usages of Debug.log() Doug Simon <doug.simon@oracle.com> parents: 14616 diff changeset	244 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	245
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	246 registeredMethodSubstitutions.put(original, substitute);
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	247 return original;
7373 6b2c55fc9ba8 reworked mechanism for omitting intrinsics if the underlying hardware support is not available and used it to make intrinsification of Integer.bitCount() dependent on whether the POPCNT instruction is available Doug Simon <doug.simon@oracle.com> parents: 7360 diff changeset	248 }
6b2c55fc9ba8 reworked mechanism for omitting intrinsics if the underlying hardware support is not available and used it to make intrinsification of Integer.bitCount() dependent on whether the POPCNT instruction is available Doug Simon <doug.simon@oracle.com> parents: 7360 diff changeset	249
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	250 /**
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	251 * Registers a macro substitution.
15002 06e50d290784 isAllowedUsageType on Nodes Lukas Stadler <lukas.stadler@oracle.com> parents: 14908 diff changeset	252 *
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	253 * @param originalMethod a method or constructor being substituted
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	254 * @param macro the substitute macro node class
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	255 * @return the original method
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	256 */
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	257 protected ResolvedJavaMethod registerMacroSubstitution(Member originalMethod, Class<? extends FixedWithNextNode> macro) {
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	258 ResolvedJavaMethod originalJavaMethod;
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	259 MetaAccessProvider metaAccess = providers.getMetaAccess();
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	260 if (originalMethod instanceof Method) {
11959 23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 11870 diff changeset	261 originalJavaMethod = metaAccess.lookupJavaMethod((Method) originalMethod);
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	262 } else {
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	263 originalJavaMethod = metaAccess.lookupJavaConstructor((Constructor<?>) originalMethod);
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	264 }
11402 7401a9c8a7bb naming cleanup Doug Simon <doug.simon@oracle.com> parents: 10903 diff changeset	265 registeredMacroSubstitutions.put(originalJavaMethod, macro);
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	266 return originalJavaMethod;
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	267 }
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	268
13128 c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	269 private static SnippetInliningPolicy createPolicyClassInstance(Class<? extends SnippetInliningPolicy> policyClass) {
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	270 try {
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	271 return policyClass.getConstructor().newInstance();
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	272 } catch (Exception e) {
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	273 throw new GraalInternalError(e);
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	274 }
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	275 }
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	276
c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	277 protected SnippetInliningPolicy inliningPolicy(ResolvedJavaMethod method) {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7510 diff changeset	278 Class<? extends SnippetInliningPolicy> policyClass = SnippetInliningPolicy.class;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	279 Snippet snippet = method.getAnnotation(Snippet.class);
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	280 if (snippet != null) {
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	281 policyClass = snippet.inlining();
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	282 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	283 if (policyClass == SnippetInliningPolicy.class) {
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	284 return new DefaultSnippetInliningPolicy(providers.getMetaAccess());
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	285 }
13128 c9660efac5f6 Factor out methods that use reflection so that they can be substituted Christian Wimmer <christian.wimmer@oracle.com> parents: 12747 diff changeset	286 return createPolicyClassInstance(policyClass);
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	287 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	288
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	289 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	290 * Creates a preprocessed graph for a snippet or method substitution.
15002 06e50d290784 isAllowedUsageType on Nodes Lukas Stadler <lukas.stadler@oracle.com> parents: 14908 diff changeset	291 *
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	292 * @param method the snippet or method substitution for which a graph will be created
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	293 * @param original the original method if {@code method} is a {@linkplain MethodSubstitution
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	294 * substitution} otherwise null
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	295 * @param policy the inlining policy to use during preprocessing
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	296 * @param frameStateProcessing controls how {@link FrameState FrameStates} should be handled.
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	297 */
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	298 public StructuredGraph makeGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, ResolvedJavaMethod recursiveEntry, SnippetInliningPolicy policy, FrameStateProcessing frameStateProcessing) {
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	299 return createGraphMaker(method, original, recursiveEntry, frameStateProcessing).makeGraph(policy);
8199 a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	300 }
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	301
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	302 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	303 * Can be overridden to return an object that specializes various parts of graph preprocessing.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	304 */
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	305 protected GraphMaker createGraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original, ResolvedJavaMethod recursiveEntry, FrameStateProcessing frameStateProcessing) {
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	306 return new GraphMaker(substitute, original, recursiveEntry, frameStateProcessing);
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	307 }
32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	308
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	309 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	310 * Cache to speed up preprocessing of replacement graphs.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	311 */
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	312 final ConcurrentMap<ResolvedJavaMethod, StructuredGraph> graphCache = new ConcurrentHashMap<>();
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	313
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	314 public enum FrameStateProcessing {
14908 8db6e76cb658 Formatter: Keep one enum constant per line Gilles Duboscq <duboscq@ssw.jku.at> parents: 14756 diff changeset	315 None,
8db6e76cb658 Formatter: Keep one enum constant per line Gilles Duboscq <duboscq@ssw.jku.at> parents: 14756 diff changeset	316 CollapseFrameForSingleSideEffect,
8db6e76cb658 Formatter: Keep one enum constant per line Gilles Duboscq <duboscq@ssw.jku.at> parents: 14756 diff changeset	317 Removal
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	318 }
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	319
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	320 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	321 * Creates and preprocesses a graph for a replacement.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	322 */
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	323 protected class GraphMaker {
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	324 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	325 * The method for which a graph is being created.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	326 */
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	327 protected final ResolvedJavaMethod method;
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	328
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	329 /**
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	330 * The method which is used when a call to {@link #recursiveEntry} is found.
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	331 */
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	332 protected final ResolvedJavaMethod substitutedMethod;
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	333
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	334 /**
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	335 * The method which is used to detect a recursive call.
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	336 */
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	337 protected final ResolvedJavaMethod recursiveEntry;
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	338
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	339 /**
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	340 * Controls how FrameStates are processed.
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	341 */
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	342 private FrameStateProcessing frameStateProcessing;
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	343
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	344 protected GraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod substitutedMethod, ResolvedJavaMethod recursiveEntry, FrameStateProcessing frameStateProcessing) {
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	345 this.method = substitute;
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	346 this.substitutedMethod = substitutedMethod;
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	347 this.recursiveEntry = recursiveEntry;
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	348 this.frameStateProcessing = frameStateProcessing;
8199 a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	349 }
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	350
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	351 public StructuredGraph makeGraph(final SnippetInliningPolicy policy) {
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	352 try (Scope s = Debug.scope("BuildSnippetGraph", method)) {
14756 3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	353 StructuredGraph graph = parseGraph(method, policy, 0);
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	354
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	355 // Cannot have a finalized version of a graph in the cache
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	356 graph = graph.copy();
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	357
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	358 finalizeGraph(graph);
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	359
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	360 Debug.dump(graph, "%s: Final", method.getName());
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	361
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	362 return graph;
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	363 } catch (Throwable e) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	364 throw Debug.handle(e);
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	365 }
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	366 }
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	367
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	368 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	369 * Does final processing of a snippet graph.
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	370 */
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	371 protected void finalizeGraph(StructuredGraph graph) {
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	372 new NodeIntrinsificationPhase(providers, snippetReflection).apply(graph);
9302 c78ef1df7b06 made verification of node intrinsification always be run, independent of whether assertions are enabled Doug Simon <doug.simon@oracle.com> parents: 9234 diff changeset	373 if (!SnippetTemplate.hasConstantParameter(method)) {
c78ef1df7b06 made verification of node intrinsification always be run, independent of whether assertions are enabled Doug Simon <doug.simon@oracle.com> parents: 9234 diff changeset	374 NodeIntrinsificationVerificationPhase.verify(graph);
c78ef1df7b06 made verification of node intrinsification always be run, independent of whether assertions are enabled Doug Simon <doug.simon@oracle.com> parents: 9234 diff changeset	375 }
9323 712d583d0d21 Perform deopt-to-guard conversion at snippet installation time. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9302 diff changeset	376 new ConvertDeoptimizeToGuardPhase().apply(graph);
8199 a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan) Doug Simon <doug.simon@oracle.com> parents: 8175 diff changeset	377
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	378 switch (frameStateProcessing) {
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	379 case Removal:
11870 a80d09922fc1 new parameter on Snippet annotation to remove all frame states Lukas Stadler <lukas.stadler@jku.at> parents: 11717 diff changeset	380 for (Node node : graph.getNodes()) {
a80d09922fc1 new parameter on Snippet annotation to remove all frame states Lukas Stadler <lukas.stadler@jku.at> parents: 11717 diff changeset	381 if (node instanceof StateSplit) {
a80d09922fc1 new parameter on Snippet annotation to remove all frame states Lukas Stadler <lukas.stadler@jku.at> parents: 11717 diff changeset	382 ((StateSplit) node).setStateAfter(null);
a80d09922fc1 new parameter on Snippet annotation to remove all frame states Lukas Stadler <lukas.stadler@jku.at> parents: 11717 diff changeset	383 }
a80d09922fc1 new parameter on Snippet annotation to remove all frame states Lukas Stadler <lukas.stadler@jku.at> parents: 11717 diff changeset	384 }
13618 b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	385 break;
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	386 case CollapseFrameForSingleSideEffect:
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	387 new CollapseFrameForSingleSideEffectPhase().apply(graph);
b87fcab6624a Replacements: use enum to describe framestate action Bernhard Urban <bernhard.urban@jku.at> parents: 13604 diff changeset	388 break;
7271 9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	389 }
11717 8a3b59397044 The SnippetFrameStateCleanupPhase now sets invalid framestates on the paths of side effecting instruction except for the last one where an AFTER_BCI is used. Gilles Duboscq <duboscq@ssw.jku.at> parents: 11698 diff changeset	390 new DeadCodeEliminationPhase().apply(graph);
7271 9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	391 }
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	392
14756 3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	393 private static final int MAX_GRAPH_INLINING_DEPTH = 100; // more than enough
3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	394
3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	395 private StructuredGraph parseGraph(final ResolvedJavaMethod methodToParse, final SnippetInliningPolicy policy, int inliningDepth) {
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	396 StructuredGraph graph = graphCache.get(methodToParse);
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	397 if (graph == null) {
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	398 StructuredGraph newGraph = null;
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	399 try (Scope s = Debug.scope("ParseGraph", methodToParse)) {
14756 3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	400 newGraph = buildGraph(methodToParse, policy == null ? inliningPolicy(methodToParse) : policy, inliningDepth);
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	401 } catch (Throwable e) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	402 throw Debug.handle(e);
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	403 }
9341 26d11d3ca6bc fixed debug scopes during snippet preparation Doug Simon <doug.simon@oracle.com> parents: 9323 diff changeset	404
26d11d3ca6bc fixed debug scopes during snippet preparation Doug Simon <doug.simon@oracle.com> parents: 9323 diff changeset	405 graphCache.putIfAbsent(methodToParse, newGraph);
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	406 graph = graphCache.get(methodToParse);
8630 f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8628 diff changeset	407 assert graph != null;
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	408 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	409 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	410 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	411
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	412 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	413 * Builds the initial graph for a snippet.
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	414 */
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	415 protected StructuredGraph buildInitialGraph(final ResolvedJavaMethod methodToParse) {
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	416 final StructuredGraph graph = new StructuredGraph(methodToParse);
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	417 try (Scope s = Debug.scope("buildInitialGraph", graph)) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	418 MetaAccessProvider metaAccess = providers.getMetaAccess();
14739 553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	419 createGraphBuilder(metaAccess, GraphBuilderConfiguration.getSnippetDefault(), OptimisticOptimizations.NONE).apply(graph);
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	420 new WordTypeVerificationPhase(metaAccess, snippetReflection, target.wordKind).apply(graph);
db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	421 new WordTypeRewriterPhase(metaAccess, snippetReflection, target.wordKind).apply(graph);
10707 a643c88d164f Add scopes to capture the graphs in ReplacementsImpl Gilles Duboscq <duboscq@ssw.jku.at> parents: 9908 diff changeset	422
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	423 if (OptCanonicalizer.getValue()) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	424 new CanonicalizerPhase(true).apply(graph, new PhaseContext(providers, assumptions));
10707 a643c88d164f Add scopes to capture the graphs in ReplacementsImpl Gilles Duboscq <duboscq@ssw.jku.at> parents: 9908 diff changeset	425 }
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	426 } catch (Throwable e) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	427 throw Debug.handle(e);
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	428 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	429 return graph;
7271 9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	430 }
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	431
14739 553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	432 protected Instance createGraphBuilder(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts) {
553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	433 return new GraphBuilderPhase.Instance(metaAccess, graphBuilderConfig, optimisticOpts);
553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	434 }
553527010fc4 Allow subclasses to provide their own graph builder Christian Wimmer <christian.wimmer@oracle.com> parents: 14636 diff changeset	435
11588 12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	436 protected Object beforeInline(@SuppressWarnings("unused") MethodCallTargetNode callTarget, @SuppressWarnings("unused") StructuredGraph callee) {
12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	437 return null;
12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	438 }
12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	439
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	440 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	441 * Called after a graph is inlined.
15002 06e50d290784 isAllowedUsageType on Nodes Lukas Stadler <lukas.stadler@oracle.com> parents: 14908 diff changeset	442 *
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	443 * @param caller the graph into which {@code callee} was inlined
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	444 * @param callee the graph that was inlined into {@code caller}
11588 12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	445 * @param beforeInlineData value returned by {@link #beforeInline}.
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	446 */
11588 12f1d5fe0133 CR-1364 Mick Jordan <mick.jordan@oracle.com> parents: 11402 diff changeset	447 protected void afterInline(StructuredGraph caller, StructuredGraph callee, Object beforeInlineData) {
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9601 diff changeset	448 if (OptCanonicalizer.getValue()) {
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	449 new CanonicalizerPhase(true).apply(caller, new PhaseContext(providers, assumptions));
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	450 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	451 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	452
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	453 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	454 * Called after all inlining for a given graph is complete.
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	455 */
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	456 protected void afterInlining(StructuredGraph graph) {
15018 db4254246f9a Remove Constant.forObject and Constant.asObject to improve compiler/VM separation Christian Wimmer <christian.wimmer@oracle.com> parents: 15002 diff changeset	457 new NodeIntrinsificationPhase(providers, snippetReflection).apply(graph);
7271 9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	458 new DeadCodeEliminationPhase().apply(graph);
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9601 diff changeset	459 if (OptCanonicalizer.getValue()) {
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	460 new CanonicalizerPhase(true).apply(graph, new PhaseContext(providers, assumptions));
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	461 }
7271 9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets Doug Simon <doug.simon@oracle.com> parents: 7229 diff changeset	462 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	463
14756 3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	464 private StructuredGraph buildGraph(final ResolvedJavaMethod methodToParse, final SnippetInliningPolicy policy, int inliningDepth) {
3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	465 assert inliningDepth < MAX_GRAPH_INLINING_DEPTH : "inlining limit exceeded";
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	466 assert isInlinable(methodToParse) : methodToParse;
8631 a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl Doug Simon <doug.simon@oracle.com> parents: 8630 diff changeset	467 final StructuredGraph graph = buildInitialGraph(methodToParse);
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	468 try (Scope s = Debug.scope("buildGraph", graph)) {
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	469 Set<MethodCallTargetNode> doNotInline = null;
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	470 for (MethodCallTargetNode callTarget : graph.getNodes(MethodCallTargetNode.class)) {
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	471 if (doNotInline != null && doNotInline.contains(callTarget)) {
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	472 continue;
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	473 }
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	474 ResolvedJavaMethod callee = callTarget.targetMethod();
14160 fd7fcd2d2072 replaced == with .equals() for comparisons between JavaMethod/JavaField/JavaType values Doug Simon <doug.simon@oracle.com> parents: 13980 diff changeset	475 if (callee.equals(recursiveEntry)) {
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	476 if (isInlinable(substitutedMethod)) {
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	477 final StructuredGraph originalGraph = buildInitialGraph(substitutedMethod);
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	478 Mark mark = graph.getMark();
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	479 InliningUtil.inline(callTarget.invoke(), originalGraph, true);
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	480 for (MethodCallTargetNode inlinedCallTarget : graph.getNewNodes(mark).filter(MethodCallTargetNode.class)) {
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	481 if (doNotInline == null) {
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	482 doNotInline = new HashSet<>();
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	483 }
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	484 // We do not want to do further inlining (now) for calls
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	485 // in the original method as this can cause unlimited
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	486 // recursive inlining given an eager inlining policy such
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	487 // as DefaultSnippetInliningPolicy.
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	488 doNotInline.add(inlinedCallTarget);
90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	489 }
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	490 Debug.dump(graph, "after inlining %s", callee);
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	491 afterInline(graph, originalGraph, null);
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	492 }
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	493 } else {
13600 32ba70c49d27 Replacements: try to inline MacroNodes first Bernhard Urban <bernhard.urban@jku.at> parents: 13585 diff changeset	494 Class<? extends FixedWithNextNode> macroNodeClass = InliningUtil.getMacroNodeClass(ReplacementsImpl.this, callee);
32ba70c49d27 Replacements: try to inline MacroNodes first Bernhard Urban <bernhard.urban@jku.at> parents: 13585 diff changeset	495 if (macroNodeClass != null) {
13601 fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	496 InliningUtil.inlineMacroNode(callTarget.invoke(), callee, macroNodeClass);
13600 32ba70c49d27 Replacements: try to inline MacroNodes first Bernhard Urban <bernhard.urban@jku.at> parents: 13585 diff changeset	497 } else {
13601 fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	498 StructuredGraph intrinsicGraph = InliningUtil.getIntrinsicGraph(ReplacementsImpl.this, callee);
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	499 if ((callTarget.invokeKind() == InvokeKind.Static \|\| callTarget.invokeKind() == InvokeKind.Special) &&
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	500 (policy.shouldInline(callee, methodToParse) \|\| (intrinsicGraph != null && policy.shouldUseReplacement(callee, methodToParse)))) {
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	501 StructuredGraph targetGraph;
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	502 if (intrinsicGraph != null && policy.shouldUseReplacement(callee, methodToParse)) {
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	503 targetGraph = intrinsicGraph;
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	504 } else {
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	505 if (callee.getName().startsWith("$jacoco")) {
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	506 throw new GraalInternalError("Parsing call to JaCoCo instrumentation method " + format("%H.%n(%p)", callee) + " from " + format("%H.%n(%p)", methodToParse) +
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	507 " while preparing replacement " + format("%H.%n(%p)", method) + ". Placing \"//JaCoCo Exclude\" anywhere in " +
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	508 methodToParse.getDeclaringClass().getSourceFileName() + " should fix this.");
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	509 }
14756 3e1e83287128 add assertion to detect infinite recursion in snippet inlining Erik Eckstein <erik.eckstein@oracle.com> parents: 14739 diff changeset	510 targetGraph = parseGraph(callee, policy, inliningDepth + 1);
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	511 }
13601 fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	512 Object beforeInlineData = beforeInline(callTarget, targetGraph);
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	513 InliningUtil.inline(callTarget.invoke(), targetGraph, true);
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	514 Debug.dump(graph, "after inlining %s", callee);
fd522e725ee5 inliningutils: minor refactor Bernhard Urban <bernhard.urban@jku.at> parents: 13600 diff changeset	515 afterInline(graph, targetGraph, beforeInlineData);
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	516 }
8913 653110156f8a refactored boxing identification and lowering, removed BoxingMethodPool and explicit boxing phases Lukas Stadler <lukas.stadler@jku.at> parents: 8912 diff changeset	517 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	518 }
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	519 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	520
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	521 afterInlining(graph);
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	522
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	523 for (LoopEndNode end : graph.getNodes(LoopEndNode.class)) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	524 end.disableSafepoint();
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	525 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	526
13197 8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	527 new DeadCodeEliminationPhase().apply(graph);
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	528 } catch (Throwable e) {
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	529 throw Debug.handle(e);
8569b9e047cd change debug scopes implementation to prevent extra frames related to mechanism being added to call stack Doug Simon <doug.simon@oracle.com> parents: 13177 diff changeset	530 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	531 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	532 }
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	533 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	534
15050 90e8e3b90558 prevent recursive inlining when a method substitution calls the original (i.e., substituted) method Doug Simon <doug.simon@oracle.com> parents: 15018 diff changeset	535 private static boolean isInlinable(final ResolvedJavaMethod method) {
15311 820c6d353358 added ModifiersProvider as superinterface for ResolvedJava[Method\|Field\|Type] and implemented all checks against modifiers as default methods Doug Simon <doug.simon@oracle.com> parents: 15259 diff changeset	536 return !method.isAbstract() && !method.isNative();
13604 bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	537 }
bd21ee1a874c fix recursion problem around macro nodes (e.g. array copy) Bernhard Urban <bernhard.urban@jku.at> parents: 13603 diff changeset	538
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	539 private static String originalName(Method substituteMethod, String methodSubstitution) {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	540 if (methodSubstitution.isEmpty()) {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	541 return substituteMethod.getName();
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	542 } else {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	543 return methodSubstitution;
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	544 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	545 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	546
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	547 /**
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	548 * Resolves a name to a class.
15002 06e50d290784 isAllowedUsageType on Nodes Lukas Stadler <lukas.stadler@oracle.com> parents: 14908 diff changeset	549 *
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	550 * @param className the name of the class to resolve
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	551 * @param optional if true, resolution failure returns null
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	552 * @return the resolved class or null if resolution fails and {@code optional} is true
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	553 */
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	554 static Class<?> resolveType(String className, boolean optional) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	555 try {
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	556 // Need to use launcher class path to handle classes
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	557 // that are not on the boot class path
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	558 ClassLoader cl = Launcher.getLauncher().getClassLoader();
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	559 return Class.forName(className, false, cl);
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	560 } catch (ClassNotFoundException e) {
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	561 if (optional) {
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	562 return null;
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	563 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	564 throw new GraalInternalError("Could not resolve type " + className);
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	565 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	566 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	567
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	568 private static Class<?> resolveType(JavaType type) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	569 JavaType base = type;
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	570 int dimensions = 0;
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	571 while (base.getComponentType() != null) {
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	572 base = base.getComponentType();
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	573 dimensions++;
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	574 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	575
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	576 Class<?> baseClass = base.getKind() != Kind.Object ? base.getKind().toJavaClass() : resolveType(toJavaName(base), false);
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	577 return dimensions == 0 ? baseClass : Array.newInstance(baseClass, new int[dimensions]).getClass();
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	578 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	579
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	580 static class JavaSignature {
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	581 final Class<?> returnType;
288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	582 final Class<?>[] parameters;
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	583
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	584 public JavaSignature(Class<?> returnType, Class<?>[] parameters) {
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	585 this.parameters = parameters;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	586 this.returnType = returnType;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	587 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	588
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	589 @Override
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	590 public String toString() {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	591 StringBuilder sb = new StringBuilder("(");
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	592 for (int i = 0; i < parameters.length; i++) {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	593 if (i != 0) {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	594 sb.append(", ");
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	595 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	596 sb.append(parameters[i].getName());
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	597 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	598 return sb.append(") ").append(returnType.getName()).toString();
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	599 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	600 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	601
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	602 private JavaSignature originalSignature(Method substituteMethod, String methodSubstitution, boolean isStatic) {
15040 288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	603 Class<?>[] parameters;
288c23143d47 Fix most raw type references. Josef Eisl <josef.eisl@jku.at> parents: 15018 diff changeset	604 Class<?> returnType;
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	605 if (methodSubstitution.isEmpty()) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	606 parameters = substituteMethod.getParameterTypes();
7510 225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7383 diff changeset	607 if (!isStatic) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	608 assert parameters.length > 0 : "must be a static method with the 'this' object as its first parameter";
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	609 parameters = Arrays.copyOfRange(parameters, 1, parameters.length);
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	610 }
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	611 returnType = substituteMethod.getReturnType();
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	612 } else {
12054 bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511) Doug Simon <doug.simon@oracle.com> parents: 12052 diff changeset	613 Signature signature = providers.getMetaAccess().parseMethodDescriptor(methodSubstitution);
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	614 parameters = new Class[signature.getParameterCount(false)];
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	615 for (int i = 0; i < parameters.length; i++) {
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	616 parameters[i] = resolveType(signature.getParameterType(i, null));
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	617 }
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	618 returnType = resolveType(signature.getReturnType(null));
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	619 }
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	620 return new JavaSignature(returnType, parameters);
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	621 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	622
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	623 private static Member originalMethod(ClassSubstitution classSubstitution, boolean optional, String name, JavaSignature signature) {
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	624 Class<?> originalClass = classSubstitution.value();
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	625 if (originalClass == ClassSubstitution.class) {
8373 86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	626 originalClass = resolveType(classSubstitution.className(), classSubstitution.optional());
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	627 if (originalClass == null) {
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	628 // optional class was not found
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	629 return null;
86a9e3ea8fe9 support substitutions for classes that made not be part of the runtime (GRAAL-123) Doug Simon <doug.simon@oracle.com> parents: 8360 diff changeset	630 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	631 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	632 try {
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	633 if (name.equals("<init>")) {
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	634 assert signature.returnType.equals(void.class) : signature;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	635 Constructor<?> original = originalClass.getDeclaredConstructor(signature.parameters);
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	636 return original;
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	637 } else {
13177 74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	638 Method original = originalClass.getDeclaredMethod(name, signature.parameters);
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	639 if (!original.getReturnType().equals(signature.returnType)) {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	640 throw new NoSuchMethodException(originalClass.getName() + "." + name + signature);
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	641 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612) Doug Simon <doug.simon@oracle.com> parents: 13146 diff changeset	642 return original;
8360 fa5a670a1682 added support for substituting constructors Doug Simon <doug.simon@oracle.com> parents: 8199 diff changeset	643 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	644 } catch (NoSuchMethodException \| SecurityException e) {
8902 59e751e68bea made method (and macro) substitution optional to support different JDK versions Doug Simon <doug.simon@oracle.com> parents: 8637 diff changeset	645 if (optional) {
59e751e68bea made method (and macro) substitution optional to support different JDK versions Doug Simon <doug.simon@oracle.com> parents: 8637 diff changeset	646 return null;
59e751e68bea made method (and macro) substitution optional to support different JDK versions Doug Simon <doug.simon@oracle.com> parents: 8637 diff changeset	647 }
7360 12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	648 throw new GraalInternalError(e);
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	649 }
12bd634440d0 support substitution of methods that are not in the bootstrap class path and/or whose signature contains non-accessible types Doug Simon <doug.simon@oracle.com> parents: 7356 diff changeset	650 }
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	651
8912 9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	652 @Override
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	653 public Collection<ResolvedJavaMethod> getAllReplacements() {
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	654 HashSet<ResolvedJavaMethod> result = new HashSet<>();
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	655 result.addAll(registeredMethodSubstitutions.keySet());
11402 7401a9c8a7bb naming cleanup Doug Simon <doug.simon@oracle.com> parents: 10903 diff changeset	656 result.addAll(registeredMacroSubstitutions.keySet());
8912 9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	657 return result;
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes Lukas Stadler <lukas.stadler@jku.at> parents: 8631 diff changeset	658 }
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	659
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	660 @Override
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	661 public boolean isForcedSubstitution(ResolvedJavaMethod method) {
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8913 diff changeset	662 return forcedSubstitutions.contains(method);
8627 75db7afee829 implemented lazy installation of replacements (GRAAL-137) Doug Simon <doug.simon@oracle.com> parents: 8484 diff changeset	663 }
9187 cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	664
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	665 @Override
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	666 public void registerSnippetTemplateCache(SnippetTemplateCache templates) {
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	667 assert snippetTemplateCache.get(templates.getClass()) == null;
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	668 snippetTemplateCache.put(templates.getClass(), templates);
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	669 }
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	670
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	671 @Override
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	672 public <T extends SnippetTemplateCache> T getSnippetTemplateCache(Class<T> templatesClass) {
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	673 SnippetTemplateCache ret = snippetTemplateCache.get(templatesClass);
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	674 return templatesClass.cast(ret);
cd2600a2336e Store snippet templates in Replacements object. Roland Schatz <roland.schatz@oracle.com> parents: 9147 diff changeset	675 }
7076 32408bd16b91 fixes after merge Christian Haeubl <haeubl@ssw.jku.at> parents: 7075 diff changeset	676 }

Mercurial > hg > truffle

annotate graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java @ 15470:c55f44b3c5e5