Cache points-to option in analysis policy.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisPolicy.java

@@ -70,6 +70,7 @@ public abstract class AnalysisPolicy {
     protected final int maxHeapContextDepth;
     protected final boolean limitObjectArrayLength;
     protected final int maxObjectSetSize;
+    protected final boolean hybridStaticContext;
 
     public AnalysisPolicy(OptionValues options) {
         this.options = options;
@@ -82,7 +83,7 @@ public AnalysisPolicy(OptionValues options) {
         maxHeapContextDepth = PointstoOptions.MaxHeapContextDepth.getValue(options);
         limitObjectArrayLength = PointstoOptions.LimitObjectArrayLength.getValue(options);
         maxObjectSetSize = PointstoOptions.MaxObjectSetSize.getValue(options);
-
+        hybridStaticContext = PointstoOptions.HybridStaticContext.getValue(options);
     }
 
     public abstract boolean isContextSensitiveAnalysis();
@@ -115,6 +116,10 @@ public int maxObjectSetSize() {
         return maxObjectSetSize;
     }
 
+    public boolean useHybridStaticContext() {
+        return hybridStaticContext;
+    }
+
     public abstract MethodTypeFlow createMethodTypeFlow(PointsToAnalysisMethod method);
 
     /**

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeAnalysisContextPolicy.java

@@ -117,7 +117,7 @@ public BytecodeAnalysisContext staticCalleeContext(PointsToAnalysis bb, Bytecode
          * the invoke location, otherwise just reuse the caller context.
          */
 
-        if (!PointstoOptions.HybridStaticContext.getValue(bb.getOptions())) {
+        if (!bb.analysisPolicy().useHybridStaticContext()) {
             return callerContext;
         }