Parse pointsto options for standalone pointsto

compiler/mx.compiler/suite.py

@@ -2168,7 +2168,7 @@
           "jdk.unsupported" # sun.misc.Unsafe
         ],
         "exports" : [
-          "* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise",
+          "* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise,org.graalvm.nativeimage.base",
           "org.graalvm.compiler.core.common            to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.agent.tracing",
           "org.graalvm.compiler.debug                  to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.hotspot                to jdk.internal.vm.compiler.management",

substratevm/mx.substratevm/mx_substratevm.py

@@ -769,6 +769,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
         'substratevm:SVM',
         'substratevm:OBJECTFILE',
         'substratevm:POINTSTO',
+        'substratevm:NATIVE_IMAGE_BASE',
     ],
     support_distributions=['substratevm:SVM_GRAALVM_SUPPORT'],
     stability="earlyadopter",

substratevm/mx.substratevm/suite.py

@@ -147,6 +147,19 @@
             "checkstyle": "com.oracle.svm.core",
             "workingSets": "SVM",
         },
+        "com.oracle.svm.common": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "dependencies": [
+                "com.oracle.svm.util"
+            ],
+            "javaCompliance": "8+",
+            "annotationProcessors": [
+                "compiler:GRAAL_PROCESSOR",
+            ],
+            "checkstyle": "com.oracle.svm.core",
+            "workingSets": "SVM",
+        },
         "com.oracle.svm.util.jdk11": {
             "subDir": "src",
             "sourceDirs": ["src"],
@@ -174,7 +187,7 @@
                 "headers",
             ],
             "dependencies": [
-                "com.oracle.svm.util",
+                "com.oracle.svm.common",
             ],
             "javaCompliance": "8+",
             "checkstyleVersion" : "8.36.1",
@@ -387,7 +400,7 @@
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.svm.util",
+                "com.oracle.svm.common",
             ],
             "checkstyle": "com.oracle.graal.pointsto",
             "javaCompliance": "8+",
@@ -1106,6 +1119,7 @@
                 "OBJECTFILE",
                 "POINTSTO",
                 "compiler:GRAAL",
+                "NATIVE_IMAGE_BASE",
             ],
             "moduleInfo" : {
                 "name" : "org.graalvm.nativeimage.builder",
@@ -1119,7 +1133,7 @@
                     "com.oracle.svm.hosted                        to java.base",
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
-                    "* to jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
+                    "* to org.graalvm.nativeimage.base,jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
                 ],
                 "opens" : [
                     "com.oracle.svm.core                          to jdk.internal.vm.compiler",
@@ -1254,6 +1268,9 @@
                     "static junit",
                     "static hamcrest",
                 ],
+                "exports" : [
+                    "* to org.graalvm.nativeimage.base,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder",
+                ],
             },
         },
 
@@ -1421,6 +1438,26 @@
             },
         },
 
+        "NATIVE_IMAGE_BASE": {
+            "subDir": "src",
+            "description" : "Native Image base that can be shared by native image building and pointsto.",
+            "dependencies": [
+                "com.oracle.svm.common",
+                "com.oracle.svm.util",
+            ],
+            "distDependencies": [
+                "compiler:GRAAL",
+            ],
+            "exclude": [
+            ],
+            "moduleInfo" : {
+                "name" : "org.graalvm.nativeimage.base",
+                "exports" : [
+                    "com.oracle.svm.util",
+                    "com.oracle.svm.common.option",
+                ],
+            }
+        },
 
         "POINTSTO": {
             "subDir": "src",
@@ -1431,13 +1468,13 @@
             ],
             "distDependencies": [
                 "compiler:GRAAL",
+                "NATIVE_IMAGE_BASE",
             ],
             "exclude": [
             ],
             "moduleInfo" : {
               "name" : "org.graalvm.nativeimage.pointsto",
               "exports" : [
-                "com.oracle.svm.util",
                 "com.oracle.graal.pointsto",
                 "com.oracle.graal.pointsto.api",
                 "com.oracle.graal.pointsto.reports",
@@ -1614,7 +1651,7 @@
             "moduleInfo" : {
                 "name" : "org.graalvm.nativeimage.llvm",
                 "exports" : [
-                    "* to org.graalvm.nativeimage.builder",
+                    "* to org.graalvm.nativeimage.builder,org.graalvm.nativeimage.base",
                 ],
             },
             "maven" : False,

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisError.java

@@ -125,6 +125,14 @@ private static String message(PointsToAnalysis bb, TypeFlow<?> objectFlow, Bytec
         }
     }
 
+    public static class InterruptAnalysis extends AnalysisError {
+        private static final long serialVersionUID = 7126612141948542452L;
+
+        InterruptAnalysis(String msg) {
+            super(msg);
+        }
+    }
+
     public static TypeNotFoundError typeNotFound(ResolvedJavaType type) {
         throw new TypeNotFoundError(type);
     }
@@ -166,4 +174,8 @@ public static void guarantee(boolean condition, String format, Object... args) {
             // Checkstyle: resume
         }
     }
+
+    public static RuntimeException interruptAnalysis(String msg) {
+        throw new InterruptAnalysis(msg);
+    }
 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.graal.pointsto.util;
+
+import com.oracle.svm.common.option.CommonOptionParser;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionValues;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat.PLUS_MINUS;
+
+public final class PointsToOptionParser {
+
+    private static PointsToOptionParser instance = new PointsToOptionParser();
+
+    private OptionValues optionValues = null;
+    private EconomicMap<OptionKey<?>, Object> analysisValues = OptionValues.newOptionMap();
+    private EconomicMap<String, OptionDescriptor> allAnalysisOptions = EconomicMap.create();
+
+    public static PointsToOptionParser getInstance() {
+        return instance;
+    }
+
+    @SuppressWarnings("unchecked")
+    private PointsToOptionParser() {
+        ClassLoader appClassLoader = PointsToOptionParser.class.getClassLoader();
+        CommonOptionParser.collectOptions(ServiceLoader.load(OptionDescriptors.class, appClassLoader), descriptor -> {
+            String name = descriptor.getName();
+            if (descriptor.getOptionKey() instanceof OptionKey) {
+                OptionDescriptor existing = allAnalysisOptions.put(name, descriptor);
+                if (existing != null) {
+                    AnalysisError.shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
+                }
+            }
+        });
+    }
+
+    public void setOptionValue(OptionKey<?> optionKey, Object value) {
+        if (optionValues == null) {
+            parse(new String[0]);
+        }
+        optionKey.update((EconomicMap<OptionKey<?>, Object>) optionValues.getMap(), value);
+    }
+
+    public OptionValues parse(String[] args) {
+        List<String> remainingArgs = new ArrayList<>();
+        Set<String> errors = new HashSet<>();
+        for (String arg : args) {
+            boolean isAnalysisOption = false;
+            isAnalysisOption |= parseOption(CommonOptionParser.HOSTED_OPTION_PREFIX, allAnalysisOptions, analysisValues, PLUS_MINUS, errors, arg, System.out);
+            if (!isAnalysisOption) {
+                remainingArgs.add(arg);
+            }
+        }
+        optionValues = new OptionValues(analysisValues);
+        if (!remainingArgs.isEmpty()) {
+            AnalysisError.interruptAnalysis(String.format("Unknown options: %s", Arrays.toString(remainingArgs.toArray(new String[0]))));
+        }
+        if (!errors.isEmpty()) {
+            StringBuilder errMsg = new StringBuilder("Option format error:\n");
+            for (String err : errors) {
+                errMsg.append(err).append("\n");
+            }
+            AnalysisError.interruptAnalysis(errMsg.toString());
+        }
+        return optionValues;
+    }
+
+    private static boolean parseOption(String optionPrefix, EconomicMap<String, OptionDescriptor> options, EconomicMap<OptionKey<?>, Object> valuesMap,
+                    BooleanOptionFormat booleanOptionFormat, Set<String> errors, String arg, PrintStream out) {
+        if (!arg.startsWith(optionPrefix)) {
+            return false;
+        }
+        try {
+            Predicate<OptionKey<?>> optionKeyPredicate = optionKey -> {
+                Class<?> clazz = optionKey.getClass();
+                // All classes from com.oracle.graal.pointsto.api.PointstoOptions are taken as non-hosted options.
+                if (clazz.getName().startsWith("com.oracle.graal.pointsto.api.PointstoOptions")) {
+                    return false;
+                }
+                if (!clazz.equals(OptionKey.class) && OptionKey.class.isAssignableFrom(clazz)) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+            OptionParseResult optionParseResult = CommonOptionParser.parseOption(options, optionKeyPredicate, arg.substring(optionPrefix.length()), valuesMap,
+                            optionPrefix, booleanOptionFormat);
+            if (optionParseResult.printFlags() || optionParseResult.printFlagsWithExtraHelp()) {
+                CommonOptionParser.printFlags(d -> optionParseResult.matchesFlags(d, () -> true), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
+                System.out.println("Abort analysis due to print flags are requested");
+                System.exit(1);
+            }
+            if (!optionParseResult.isValid()) {
+                errors.add(optionParseResult.getError());
+            }
+        } catch (UnsupportedOptionClassException e) {
+            AnalysisError.shouldNotReachHere(e);
+        }
+        return true;
+    }
+}