|
27 | 27 | import static com.oracle.svm.common.meta.MultiMethod.DEOPT_TARGET_METHOD; |
28 | 28 | import static com.oracle.svm.common.meta.MultiMethod.ORIGINAL_METHOD; |
29 | 29 | import static com.oracle.svm.hosted.code.SubstrateCompilationDirectives.RUNTIME_COMPILED_METHOD; |
| 30 | +import static com.oracle.svm.hosted.phases.InlineBeforeAnalysisPolicyUtils.Options.InlineBeforeAnalysisAllowedDepth; |
| 31 | +import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth; |
30 | 32 |
|
31 | 33 | import java.util.ArrayList; |
32 | 34 | import java.util.Collection; |
|
50 | 52 | import org.graalvm.compiler.debug.Indent; |
51 | 53 | import org.graalvm.compiler.graph.NodeClass; |
52 | 54 | import org.graalvm.compiler.java.BytecodeParser; |
53 | | -import org.graalvm.compiler.java.BytecodeParserOptions; |
54 | 55 | import org.graalvm.compiler.java.GraphBuilderPhase; |
55 | 56 | import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; |
56 | 57 | import org.graalvm.compiler.nodes.CallTargetNode; |
@@ -934,19 +935,19 @@ public Function<AnalysisType, ResolvedJavaType> getStrengthenGraphsToTargetFunct |
934 | 935 | /** |
935 | 936 | * This policy is a combination of the default InliningBeforeAnalysisImpl and the Trivial |
936 | 937 | * Inlining Policy. When the depth is less than |
937 | | - * {@link BytecodeParserOptions#InlineDuringParsingMaxDepth} (and all inlined parents were also |
| 938 | + * {@code BytecodeParserOptions#InlineDuringParsingMaxDepth} (and all inlined parents were also |
938 | 939 | * trivial inlined), then it will continue to try to trivial inline methods (i.e., inline |
939 | 940 | * methods with less than a given number of nodes). Then, up to |
940 | | - * {@link InlineBeforeAnalysisPolicyUtils.Options#InlineBeforeAnalysisAllowedDepth}, inlining is |
| 941 | + * {@code InlineBeforeAnalysisPolicyUtils.Options#InlineBeforeAnalysisAllowedDepth}, inlining is |
941 | 942 | * enabled as long as the cumulative number of nodes inlined stays within the specified limits. |
942 | 943 | * |
943 | 944 | * Note that this policy is used exclusively by the runtime compiled methods, so there is no |
944 | 945 | * need to check multi-method keys; all callers (and callees) should be |
945 | 946 | * {@code RUNTIME_COMPILED_METHOD}s. |
946 | 947 | */ |
947 | 948 | private class RuntimeCompilationInlineBeforeAnalysisPolicy extends InlineBeforeAnalysisPolicy { |
948 | | - private final int accumulativeAllowedInliningDepth = InlineBeforeAnalysisPolicyUtils.Options.InlineBeforeAnalysisAllowedDepth.getValue(); |
949 | | - private final int trivialAllowingInliningDepth = BytecodeParserOptions.InlineDuringParsingMaxDepth.getDefaultValue(); |
| 949 | + private final int accumulativeAllowedInliningDepth = InlineBeforeAnalysisAllowedDepth.getValue(); |
| 950 | + private final int trivialAllowingInliningDepth = InlineDuringParsingMaxDepth.getDefaultValue(); |
950 | 951 |
|
951 | 952 | final SVMHost hostVM; |
952 | 953 | final InlineBeforeAnalysisPolicyUtils inliningUtils; |
|
0 commit comments