Mercurial > hg > truffle

annotate graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java @ 13197:8569b9e047cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change debug scopes implementation to prevent extra frames related to mechanism being added to call stack
author Doug Simon <doug.simon@oracle.com>
date Sat, 30 Nov 2013 01:16:55 +0100
parents 74cfcd0fbedf
children de8f74d49690
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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.*;
9864
063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27)
Doug Simon <doug.simon@oracle.com>
parents: 9601
diff changeset
27 import static com.oracle.graal.phases.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.*;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
38 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
39 import com.oracle.graal.debug.Debug.Scope;
12714
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
40 import com.oracle.graal.debug.internal.*;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
41 import com.oracle.graal.graph.*;
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
42 import com.oracle.graal.java.*;
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
43 import com.oracle.graal.nodes.*;
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
44 import com.oracle.graal.nodes.java.*;
7300
2912b72d840a More complete and reusable Word type
Christian Wimmer <christian.wimmer@oracle.com>
parents: 7295
diff changeset
45 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
46 import com.oracle.graal.nodes.spi.*;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
47 import com.oracle.graal.phases.*;
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
48 import com.oracle.graal.phases.common.*;
11569
2f6734f8126a Avoid direct usage of CanonicalizerPhase.Instance in replacements processing.
Roland Schatz <roland.schatz@oracle.com>
parents: 11491
diff changeset
49 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
50 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
51 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
52 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
53 import com.oracle.graal.word.phases.*;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
54
8628
77de2f3df379 renames: [HotSpot]ReplacementsInstaller -> [HotSpot]ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8627
diff changeset
55 public class ReplacementsImpl implements Replacements {
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
56
12054
bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 12052
diff changeset
57 protected final Providers providers;
8199
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
58 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
59 protected final Assumptions assumptions;
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
60
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
61 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
62 * The preprocessed replacement graphs.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
63 */
13146
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
64 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
65
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
66 // 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
67 // 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
68 protected final Map<ResolvedJavaMethod, ResolvedJavaMethod> registeredMethodSubstitutions;
11402
7401a9c8a7bb naming cleanup
Doug Simon <doug.simon@oracle.com>
parents: 10903
diff changeset
69 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
70 private final Set<ResolvedJavaMethod> forcedSubstitutions;
9187
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
71 private final Map<Class<? extends SnippetTemplateCache>, SnippetTemplateCache> snippetTemplateCache;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
72
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
73 public ReplacementsImpl(Providers providers, Assumptions assumptions, TargetDescription target) {
12429
5124eeec1a7b split HotSpotRuntime into separate provider implementations
Doug Simon <doug.simon@oracle.com>
parents: 12408
diff changeset
74 this.providers = providers.copyWith(this);
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
75 this.target = target;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
76 this.assumptions = assumptions;
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
77 this.graphs = new ConcurrentHashMap<>();
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
78 this.registeredMethodSubstitutions = new HashMap<>();
11402
7401a9c8a7bb naming cleanup
Doug Simon <doug.simon@oracle.com>
parents: 10903
diff changeset
79 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
80 this.forcedSubstitutions = new HashSet<>();
9187
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
81 this.snippetTemplateCache = new HashMap<>();
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
82 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
83
12706
bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false)
Doug Simon <doug.simon@oracle.com>
parents: 12432
diff changeset
84 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
85 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
86
13146
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
87 @Override
9015
92d2bedb5dfc Change of Snippet template and instantiation process
Christian Wimmer <christian.wimmer@oracle.com>
parents: 8981
diff changeset
88 public StructuredGraph getSnippet(ResolvedJavaMethod method) {
92d2bedb5dfc Change of Snippet template and instantiation process
Christian Wimmer <christian.wimmer@oracle.com>
parents: 8981
diff changeset
89 assert method.getAnnotation(Snippet.class) != null : "Snippet must be annotated with @" + Snippet.class.getSimpleName();
92d2bedb5dfc Change of Snippet template and instantiation process
Christian Wimmer <christian.wimmer@oracle.com>
parents: 8981
diff changeset
90 assert !Modifier.isAbstract(method.getModifiers()) && !Modifier.isNative(method.getModifiers()) : "Snippet must not be abstract or native";
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
91
12706
bb5fa27daa20 added ability to disable snippet graph preparation cache (-Dgraal.useSnippetGraphCache=false)
Doug Simon <doug.simon@oracle.com>
parents: 12432
diff changeset
92 StructuredGraph graph = UseSnippetGraphCache ? graphs.get(method) : null;
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
93 if (graph == null) {
12714
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
94 try (TimerCloseable a = SnippetPreparationTime.start()) {
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
95 StructuredGraph newGraph = makeGraph(method, null, inliningPolicy(method), method.getAnnotation(Snippet.class).removeAllFrameStates());
12747
b5cf28c97430 replaced global snippet and template node metrics with per-snippet and per-template metrics
Doug Simon <doug.simon@oracle.com>
parents: 12745
diff changeset
96 Debug.metric("SnippetNodeCount[" + method.getName() + "]").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
97 if (!UseSnippetGraphCache) {
12714
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
98 return newGraph;
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
99 }
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
100 graphs.putIfAbsent(method, newGraph);
655c87d8d3c2 added SnippetPreparationTime metric
Doug Simon <doug.simon@oracle.com>
parents: 12706
diff changeset
101 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
102 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
103 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
104 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
105 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
106
13146
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
107 @Override
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
108 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
109 // 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
110 }
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
111
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
112 @Override
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
113 public void prepareSnippetCopyAfterInstantiation(StructuredGraph snippetCopy) {
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
114
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
115 // 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
116
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
117 new NodeIntrinsificationPhase(providers).apply(snippetCopy);
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
118 new CanonicalizerPhase(true).apply(snippetCopy, new PhaseContext(providers, assumptions));
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
119 NodeIntrinsificationVerificationPhase.verify(snippetCopy);
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
120 }
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
121
ffbfc3e78746 extend replacements API to support svm specific snippet handling
Erik Eckstein <erik.eckstein@oracle.com>
parents: 13132
diff changeset
122 @Override
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
123 public StructuredGraph getMethodSubstitution(ResolvedJavaMethod original) {
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
124 ResolvedJavaMethod substitute = registeredMethodSubstitutions.get(original);
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
125 if (substitute == null) {
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
126 return null;
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
127 }
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
128 StructuredGraph graph = graphs.get(substitute);
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
129 if (graph == null) {
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
130 graphs.putIfAbsent(substitute, makeGraph(substitute, original, inliningPolicy(substitute), false));
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
131 graph = graphs.get(substitute);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
132 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
133 return graph;
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
134
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
135 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
136
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
137 public Class<? extends FixedWithNextNode> getMacroSubstitution(ResolvedJavaMethod method) {
11402
7401a9c8a7bb naming cleanup
Doug Simon <doug.simon@oracle.com>
parents: 10903
diff changeset
138 return registeredMacroSubstitutions.get(method);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
139 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
140
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
141 public Assumptions getAssumptions() {
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
142 return assumptions;
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
143 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
144
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
145 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
146 ClassSubstitution classSubstitution = substitutions.getAnnotation(ClassSubstitution.class);
7545
b30b33d9da80 sanity checks for SnippetInstaller.installSubstitutions()
Doug Simon <doug.simon@oracle.com>
parents: 7530
diff changeset
147 assert classSubstitution != null;
8413
d9347ee39fbe rename: SnippetsInterface -> Snippets
Doug Simon <doug.simon@oracle.com>
parents: 8410
diff changeset
148 assert !Snippets.class.isAssignableFrom(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
149 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
150 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
151 MacroSubstitution macroSubstitution = substituteMethod.getAnnotation(MacroSubstitution.class);
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
152 if (methodSubstitution == null && macroSubstitution == null) {
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
153 continue;
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
154 }
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
155
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
156 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
157 if (!Modifier.isStatic(modifiers)) {
10903
d518ea24c82b added ClassIsInterfaceNode macro node
Doug Simon <doug.simon@oracle.com>
parents: 10707
diff changeset
158 throw new GraalInternalError("Substitution methods must be static: " + substituteMethod);
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
159 }
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
160
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
161 if (methodSubstitution != null) {
10903
d518ea24c82b added ClassIsInterfaceNode macro node
Doug Simon <doug.simon@oracle.com>
parents: 10707
diff changeset
162 if (macroSubstitution != null && macroSubstitution.isStatic() != methodSubstitution.isStatic()) {
d518ea24c82b added ClassIsInterfaceNode macro node
Doug Simon <doug.simon@oracle.com>
parents: 10707
diff changeset
163 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
164 }
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
165 if (Modifier.isAbstract(modifiers) || Modifier.isNative(modifiers)) {
10903
d518ea24c82b added ClassIsInterfaceNode macro node
Doug Simon <doug.simon@oracle.com>
parents: 10707
diff changeset
166 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
167 }
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
168 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
169 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
170 Member originalMethod = originalMethod(classSubstitution, methodSubstitution.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
171 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
172 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
173 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
174 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
175 }
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
176 }
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
177 }
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
178 if (macroSubstitution != null) {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
179 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
180 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
181 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
182 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
183 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
184 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
185 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
186 }
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
187 }
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
188 }
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
189 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
190 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
191
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
192 /**
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
193 * Registers a method substitution.
11698
4eec2ac671c2 Refactor the WordTypeVerificationPhase to use fewer graph iterations, and invoke it a fewer places
Christian Wimmer <christian.wimmer@oracle.com>
parents: 11593
diff changeset
194 *
8431
be5ce3e9d473 rename: originalMethod -> originalMember
Doug Simon <doug.simon@oracle.com>
parents: 8430
diff changeset
195 * @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
196 * @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
197 * @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
198 */
8915
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining)
Lukas Stadler <lukas.stadler@jku.at>
parents: 8913
diff changeset
199 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
200 MetaAccessProvider metaAccess = providers.getMetaAccess();
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11870
diff changeset
201 ResolvedJavaMethod substitute = metaAccess.lookupJavaMethod(substituteMethod);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
202 ResolvedJavaMethod original;
8431
be5ce3e9d473 rename: originalMethod -> originalMember
Doug Simon <doug.simon@oracle.com>
parents: 8430
diff changeset
203 if (originalMember instanceof Method) {
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11870
diff changeset
204 original = metaAccess.lookupJavaMethod((Method) originalMember);
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
205 } else {
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11870
diff changeset
206 original = metaAccess.lookupJavaConstructor((Constructor) originalMember);
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
207 }
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
208 Debug.log("substitution: " + MetaUtil.format("%H.%n(%p) %r", original) + " --> " + MetaUtil.format("%H.%n(%p) %r", substitute));
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
209
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
210 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
211 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
212 }
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
213
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
214 /**
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
215 * Registers a macro substitution.
11698
4eec2ac671c2 Refactor the WordTypeVerificationPhase to use fewer graph iterations, and invoke it a fewer places
Christian Wimmer <christian.wimmer@oracle.com>
parents: 11593
diff changeset
216 *
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
217 * @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
218 * @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
219 * @return the original method
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
220 */
8915
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining)
Lukas Stadler <lukas.stadler@jku.at>
parents: 8913
diff changeset
221 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
222 ResolvedJavaMethod originalJavaMethod;
12054
bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 12052
diff changeset
223 MetaAccessProvider metaAccess = providers.getMetaAccess();
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
224 if (originalMethod instanceof Method) {
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11870
diff changeset
225 originalJavaMethod = metaAccess.lookupJavaMethod((Method) originalMethod);
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
226 } else {
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11870
diff changeset
227 originalJavaMethod = metaAccess.lookupJavaConstructor((Constructor) originalMethod);
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
228 }
11402
7401a9c8a7bb naming cleanup
Doug Simon <doug.simon@oracle.com>
parents: 10903
diff changeset
229 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
230 return originalJavaMethod;
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
231 }
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
232
13128
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
233 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
234 try {
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
235 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
236 } 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
237 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
238 }
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
239 }
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
240
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
241 protected SnippetInliningPolicy inliningPolicy(ResolvedJavaMethod method) {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7510
diff changeset
242 Class<? extends SnippetInliningPolicy> policyClass = SnippetInliningPolicy.class;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
243 Snippet snippet = method.getAnnotation(Snippet.class);
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
244 if (snippet != null) {
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
245 policyClass = snippet.inlining();
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
246 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
247 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
248 return new DefaultSnippetInliningPolicy(providers.getMetaAccess());
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
249 }
13128
c9660efac5f6 Factor out methods that use reflection so that they can be substituted
Christian Wimmer <christian.wimmer@oracle.com>
parents: 12747
diff changeset
250 return createPolicyClassInstance(policyClass);
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
251 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
252
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
253 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
254 * Creates a preprocessed graph for a snippet or method substitution.
11698
4eec2ac671c2 Refactor the WordTypeVerificationPhase to use fewer graph iterations, and invoke it a fewer places
Christian Wimmer <christian.wimmer@oracle.com>
parents: 11593
diff changeset
255 *
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
256 * @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
257 * @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
258 * substitution} otherwise null
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
259 * @param policy the inlining policy to use during preprocessing
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
260 * @param removeAllFrameStates removes all frame states from side effecting instructions
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
261 */
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
262 public StructuredGraph makeGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, SnippetInliningPolicy policy, boolean removeAllFrameStates) {
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
263 return createGraphMaker(method, original).makeGraph(policy, removeAllFrameStates);
8199
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
264 }
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
265
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
266 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
267 * 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
268 */
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
269 protected GraphMaker createGraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original) {
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
270 return new GraphMaker(substitute, original);
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
271 }
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
272
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
273 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
274 * 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
275 */
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
276 final ConcurrentMap<ResolvedJavaMethod, StructuredGraph> graphCache = new ConcurrentHashMap<>();
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
277
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
278 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
279 * 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
280 */
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
281 protected class GraphMaker {
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
282
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
283 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
284 * 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
285 */
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
286 protected final ResolvedJavaMethod method;
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
287
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
288 /**
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
289 * The original method if {@link #method} is a {@linkplain MethodSubstitution substitution}
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
290 * otherwise null.
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
291 */
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
292 protected final ResolvedJavaMethod original;
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
293
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
294 boolean substituteCallsOriginal;
8199
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
295
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
296 protected GraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original) {
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
297 this.method = substitute;
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
298 this.original = original;
8199
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
299 }
a68310b2b8b8 made GraphBuilderPhase and SnippetInstaller more extensible (inspired by patch from Mick Jordan)
Doug Simon <doug.simon@oracle.com>
parents: 8175
diff changeset
300
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
301 public StructuredGraph makeGraph(final SnippetInliningPolicy policy, final boolean removeAllFrameStates) {
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
302 try (Scope s = Debug.scope("BuildSnippetGraph", method)) {
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
303 StructuredGraph graph = parseGraph(method, policy);
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
304
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
305 // 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
306 graph = graph.copy();
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
307
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
308 finalizeGraph(graph, removeAllFrameStates);
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
309
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
310 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
311
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
312 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
313 } 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
314 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
315 }
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
316 }
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
317
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
318 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
319 * 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
320 */
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
321 protected void finalizeGraph(StructuredGraph graph, boolean removeAllFrameStates) {
12362
f53dc8bbb88c refactored isReexecutable(), getKilledLocations() and canDeoptimize() out of MetaAccessProvider into ForeignCallsProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 12054
diff changeset
322 new NodeIntrinsificationPhase(providers).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
323 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
324 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
325 }
9323
712d583d0d21 Perform deopt-to-guard conversion at snippet installation time.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 9302
diff changeset
326 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
327
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
328 if (original == null) {
11870
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
329 if (removeAllFrameStates) {
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
330 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
331 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
332 ((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
333 }
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
334 }
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
335 } else {
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
336 new SnippetFrameStateCleanupPhase().apply(graph);
a80d09922fc1 new parameter on Snippet annotation to remove all frame states
Lukas Stadler <lukas.stadler@jku.at>
parents: 11717
diff changeset
337 }
7271
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets
Doug Simon <doug.simon@oracle.com>
parents: 7229
diff changeset
338 }
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
339 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
340 }
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
341
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
342 private StructuredGraph parseGraph(final ResolvedJavaMethod methodToParse, final SnippetInliningPolicy policy) {
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
343 StructuredGraph graph = graphCache.get(methodToParse);
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
344 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
345 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
346 try (Scope s = Debug.scope("ParseGraph", methodToParse)) {
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
347 newGraph = buildGraph(methodToParse, policy == null ? inliningPolicy(methodToParse) : policy);
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
348 } 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
349 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
350 }
9341
26d11d3ca6bc fixed debug scopes during snippet preparation
Doug Simon <doug.simon@oracle.com>
parents: 9323
diff changeset
351
26d11d3ca6bc fixed debug scopes during snippet preparation
Doug Simon <doug.simon@oracle.com>
parents: 9323
diff changeset
352 graphCache.putIfAbsent(methodToParse, newGraph);
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
353 graph = graphCache.get(methodToParse);
8630
f32fa4cdfbb1 fixed concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8628
diff changeset
354 assert graph != null;
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
355 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
356 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
357 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
358
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
359 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
360 * 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
361 */
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
362 protected StructuredGraph buildInitialGraph(final ResolvedJavaMethod methodToParse) {
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
363 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
364 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
365 MetaAccessProvider metaAccess = providers.getMetaAccess();
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
366 ForeignCallsProvider foreignCalls = providers.getForeignCalls();
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
367 new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getSnippetDefault(), OptimisticOptimizations.NONE).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
368 new WordTypeVerificationPhase(metaAccess, target.wordKind).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
369 new WordTypeRewriterPhase(metaAccess, target.wordKind).apply(graph);
10707
a643c88d164f Add scopes to capture the graphs in ReplacementsImpl
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 9908
diff changeset
370
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
371 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
372 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
373 }
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
374 } 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
375 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
376 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
377 return graph;
7271
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets
Doug Simon <doug.simon@oracle.com>
parents: 7229
diff changeset
378 }
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets
Doug Simon <doug.simon@oracle.com>
parents: 7229
diff changeset
379
11588
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
380 protected Object beforeInline(@SuppressWarnings("unused") MethodCallTargetNode callTarget, @SuppressWarnings("unused") StructuredGraph callee) {
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
381 return null;
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
382 }
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
383
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
384 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
385 * Called after a graph is inlined.
11698
4eec2ac671c2 Refactor the WordTypeVerificationPhase to use fewer graph iterations, and invoke it a fewer places
Christian Wimmer <christian.wimmer@oracle.com>
parents: 11593
diff changeset
386 *
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
387 * @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
388 * @param callee the graph that was inlined into {@code caller}
11588
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
389 * @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
390 */
11588
12f1d5fe0133 CR-1364
Mick Jordan <mick.jordan@oracle.com>
parents: 11402
diff changeset
391 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
392 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
393 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
394 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
395 }
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
396
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
397 /**
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
398 * 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
399 */
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
400 protected void afterInlining(StructuredGraph graph) {
12362
f53dc8bbb88c refactored isReexecutable(), getKilledLocations() and canDeoptimize() out of MetaAccessProvider into ForeignCallsProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 12054
diff changeset
401 new NodeIntrinsificationPhase(providers).apply(graph);
7271
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets
Doug Simon <doug.simon@oracle.com>
parents: 7229
diff changeset
402 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
403 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
404 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
405 }
7271
9c06e8bd8769 added phase to remove unnecessary frame states from substitution snippets
Doug Simon <doug.simon@oracle.com>
parents: 7229
diff changeset
406 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
407
8631
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
408 private StructuredGraph buildGraph(final ResolvedJavaMethod methodToParse, final SnippetInliningPolicy policy) {
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
409 assert !Modifier.isAbstract(methodToParse.getModifiers()) && !Modifier.isNative(methodToParse.getModifiers()) : methodToParse;
a5ad23f6f9ca fixed more concurrency issues in ReplacementsImpl
Doug Simon <doug.simon@oracle.com>
parents: 8630
diff changeset
410 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
411 try (Scope s = Debug.scope("buildGraph", 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
412
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
413 for (MethodCallTargetNode callTarget : graph.getNodes(MethodCallTargetNode.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
414 ResolvedJavaMethod callee = callTarget.targetMethod();
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
415 if (callee == method) {
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
416 final StructuredGraph originalGraph = new StructuredGraph(original);
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 MetaAccessProvider metaAccess = providers.getMetaAccess();
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 ForeignCallsProvider foreignCalls = providers.getForeignCalls();
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
419 new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getSnippetDefault(), OptimisticOptimizations.NONE).apply(originalGraph);
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
420 new WordTypeVerificationPhase(metaAccess, target.wordKind).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
421 new WordTypeRewriterPhase(metaAccess, target.wordKind).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
422
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 InliningUtil.inline(callTarget.invoke(), originalGraph, true);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
424
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
425 Debug.dump(graph, "after inlining %s", callee);
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 afterInline(graph, originalGraph, 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
427 substituteCallsOriginal = true;
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 } else {
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
429 StructuredGraph intrinsicGraph = InliningUtil.getIntrinsicGraph(ReplacementsImpl.this, callee);
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
430 if ((callTarget.invokeKind() == InvokeKind.Static || callTarget.invokeKind() == InvokeKind.Special) &&
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
431 (policy.shouldInline(callee, methodToParse) || (intrinsicGraph != null && policy.shouldUseReplacement(callee, methodToParse)))) {
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
432 StructuredGraph targetGraph;
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
433 if (intrinsicGraph != null && policy.shouldUseReplacement(callee, methodToParse)) {
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
434 targetGraph = intrinsicGraph;
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
435 } else {
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
436 if (callee.getName().startsWith("$jacoco")) {
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
437 throw new GraalInternalError("Parsing call to JaCoCo instrumentation method " + format("%H.%n(%p)", callee) + " from " + format("%H.%n(%p)", methodToParse) +
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
438 " while preparing replacement " + format("%H.%n(%p)", method) + ". Placing \"//JaCoCo Exclude\" anywhere in " +
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
439 methodToParse.getDeclaringClass().getSourceFileName() + " should fix this.");
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
440 }
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
441 targetGraph = parseGraph(callee, policy);
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
442 }
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
443 Object beforeInlineData = beforeInline(callTarget, targetGraph);
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
444 InliningUtil.inline(callTarget.invoke(), targetGraph, true);
10707
a643c88d164f Add scopes to capture the graphs in ReplacementsImpl
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 9908
diff changeset
445 Debug.dump(graph, "after inlining %s", callee);
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
446 afterInline(graph, targetGraph, beforeInlineData);
8913
653110156f8a refactored boxing identification and lowering, removed BoxingMethodPool and explicit boxing phases
Lukas Stadler <lukas.stadler@jku.at>
parents: 8912
diff changeset
447 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
448 }
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
449 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
450
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
451 afterInlining(graph);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
452
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
453 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
454 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
455 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
456
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
457 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
458 } 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
459 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
460 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
461 return graph;
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
462 }
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
463 }
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
464
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
465 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
466 if (methodSubstitution.isEmpty()) {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
467 return substituteMethod.getName();
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
468 } else {
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
469 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
470 }
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
471 }
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
472
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
473 /**
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
474 * Resolves a name to a class.
11698
4eec2ac671c2 Refactor the WordTypeVerificationPhase to use fewer graph iterations, and invoke it a fewer places
Christian Wimmer <christian.wimmer@oracle.com>
parents: 11593
diff changeset
475 *
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
476 * @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
477 * @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
478 * @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
479 */
8466
c7a2a937233f added @Alias annotation for accessing fields and methods otherwise inaccessible due to Java access rules
Doug Simon <doug.simon@oracle.com>
parents: 8450
diff changeset
480 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
481 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
482 // 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
483 // 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
484 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
485 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
486 } 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
487 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
488 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
489 }
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
490 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
491 }
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
492 }
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
493
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
494 private static Class resolveType(JavaType 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
495 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
496 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
497 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
498 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
499 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
500 }
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
501
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
502 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
503 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
504 }
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
505
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
506 static class JavaSignature {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
507 final Class returnType;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
508 final Class[] parameters;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
509
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
510 public JavaSignature(Class returnType, Class[] parameters) {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
511 this.parameters = parameters;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
512 this.returnType = returnType;
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
513 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
514
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
515 @Override
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
516 public String toString() {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
517 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
518 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
519 if (i != 0) {
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
520 sb.append(", ");
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
521 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
522 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
523 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
524 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
525 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
526 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
527
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
528 private JavaSignature originalSignature(Method substituteMethod, String methodSubstitution, boolean 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
529 Class[] parameters;
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
530 Class returnType;
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
531 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
532 parameters = substituteMethod.getParameterTypes();
7510
225002aba5a5 added new macro node facility, removed ArrayCopyIntrinsificationPhase
Lukas Stadler <lukas.stadler@jku.at>
parents: 7383
diff changeset
533 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
534 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
535 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
536 }
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
537 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
538 } else {
12054
bba234a1670e grouped provider values/parameters into a Providers object (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 12052
diff changeset
539 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
540 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
541 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
542 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
543 }
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
544 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
545 }
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
546 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
547 }
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
548
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
549 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
550 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
551 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
552 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
553 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
554 // 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
555 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
556 }
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
557 }
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 try {
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
559 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
560 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
561 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
562 return original;
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
563 } else {
13177
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
564 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
565 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
566 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
567 }
74cfcd0fbedf made method substitution take return types into account (GRAAL-612)
Doug Simon <doug.simon@oracle.com>
parents: 13146
diff changeset
568 return original;
8360
fa5a670a1682 added support for substituting constructors
Doug Simon <doug.simon@oracle.com>
parents: 8199
diff changeset
569 }
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
570 } 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
571 if (optional) {
59e751e68bea made method (and macro) substitution optional to support different JDK versions
Doug Simon <doug.simon@oracle.com>
parents: 8637
diff changeset
572 return null;
59e751e68bea made method (and macro) substitution optional to support different JDK versions
Doug Simon <doug.simon@oracle.com>
parents: 8637
diff changeset
573 }
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
574 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
575 }
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
576 }
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
577
8912
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
578 @Override
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
579 public Collection<ResolvedJavaMethod> getAllReplacements() {
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
580 HashSet<ResolvedJavaMethod> result = new HashSet<>();
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
581 result.addAll(registeredMethodSubstitutions.keySet());
11402
7401a9c8a7bb naming cleanup
Doug Simon <doug.simon@oracle.com>
parents: 10903
diff changeset
582 result.addAll(registeredMacroSubstitutions.keySet());
8912
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
583 return result;
9631f95971a3 new GraalOption.BootstrapReplacements for debugging purposes
Lukas Stadler <lukas.stadler@jku.at>
parents: 8631
diff changeset
584 }
8915
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining)
Lukas Stadler <lukas.stadler@jku.at>
parents: 8913
diff changeset
585
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining)
Lukas Stadler <lukas.stadler@jku.at>
parents: 8913
diff changeset
586 @Override
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining)
Lukas Stadler <lukas.stadler@jku.at>
parents: 8913
diff changeset
587 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
588 return forcedSubstitutions.contains(method);
8627
75db7afee829 implemented lazy installation of replacements (GRAAL-137)
Doug Simon <doug.simon@oracle.com>
parents: 8484
diff changeset
589 }
9187
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
590
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
591 @Override
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
592 public void registerSnippetTemplateCache(SnippetTemplateCache templates) {
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
593 assert snippetTemplateCache.get(templates.getClass()) == null;
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
594 snippetTemplateCache.put(templates.getClass(), templates);
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
595 }
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
596
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
597 @Override
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
598 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
599 SnippetTemplateCache ret = snippetTemplateCache.get(templatesClass);
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
600 return templatesClass.cast(ret);
cd2600a2336e Store snippet templates in Replacements object.
Roland Schatz <roland.schatz@oracle.com>
parents: 9147
diff changeset
601 }
7076
32408bd16b91 fixes after merge
Christian Haeubl <haeubl@ssw.jku.at>
parents: 7075
diff changeset
602 }