@@ -219,6 +219,7 @@ public interface CompileFunction {
219
219
220
220
private SnippetReflectionProvider snippetReflection ;
221
221
private final FeatureHandler featureHandler ;
222
+ private final OptionValues compileOptions ;
222
223
223
224
private volatile boolean inliningProgress ;
224
225
@@ -391,6 +392,7 @@ public CompileQueue(DebugContext debug, FeatureHandler featureHandler, HostedUni
391
392
this .executor = new CompletionExecutor (universe .getBigBang (), executorService , universe .getBigBang ().getHeartbeatCallback ());
392
393
this .featureHandler = featureHandler ;
393
394
this .snippetReflection = snippetReflection ;
395
+ this .compileOptions = getCustomizedOptions (debug );
394
396
395
397
callForReplacements (debug , runtimeConfig );
396
398
}
@@ -836,13 +838,12 @@ private StructuredGraph transplantGraph(DebugContext debug, HostedMethod hMethod
836
838
*/
837
839
aMethod .setAnalyzedGraph (null );
838
840
839
- OptionValues options = getCustomizedOptions (debug );
840
841
/*
841
842
* The static analysis always needs NodeSourcePosition. But for AOT compilation, we only
842
843
* need to preserve them when explicitly enabled, to reduce memory pressure.
843
844
*/
844
- boolean trackNodeSourcePosition = GraalOptions .TrackNodeSourcePosition .getValue (options );
845
- StructuredGraph graph = aGraph .copy (universe .lookup (aGraph .method ()), options , debug , trackNodeSourcePosition );
845
+ boolean trackNodeSourcePosition = GraalOptions .TrackNodeSourcePosition .getValue (compileOptions );
846
+ StructuredGraph graph = aGraph .copy (universe .lookup (aGraph .method ()), compileOptions , debug , trackNodeSourcePosition );
846
847
847
848
transplantEscapeAnalysisState (graph );
848
849
@@ -1078,7 +1079,7 @@ private void defaultParseFunction(DebugContext debug, HostedMethod method, Compi
1078
1079
Bytecode code = new ResolvedJavaMethodBytecode (method );
1079
1080
// DebugContext debug = new DebugContext(options,
1080
1081
// providers.getSnippetReflection());
1081
- graph = new SubstrateIntrinsicGraphBuilder (getCustomizedOptions ( debug ) , debug , providers ,
1082
+ graph = new SubstrateIntrinsicGraphBuilder (compileOptions , debug , providers ,
1082
1083
code ).buildGraph (plugin );
1083
1084
}
1084
1085
}
@@ -1088,7 +1089,7 @@ private void defaultParseFunction(DebugContext debug, HostedMethod method, Compi
1088
1089
}
1089
1090
if (graph == null ) {
1090
1091
needParsing = true ;
1091
- graph = new StructuredGraph .Builder (getCustomizedOptions ( debug ) , debug )
1092
+ graph = new StructuredGraph .Builder (compileOptions , debug )
1092
1093
.method (method )
1093
1094
.recordInlinedMethods (false )
1094
1095
.build ();
0 commit comments