Mercurial > hg > graal-compiler

changeset 22841:7f197e28f502

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made ShowFlags and PrintFlags denote which options had their value explicitily set (like -XX:+PrintFlagsFinal does)
author Doug Simon <doug.simon@oracle.com>
date Fri, 16 Oct 2015 00:18:47 +0200
parents 63a6c6173649
children b86ec09ecca6
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java mx.graal/suite.py
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Fri Oct 16 00:17:53 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Fri Oct 16 00:18:47 2015 +0200
@@ -125,15 +125,19 @@
          */
         public Config(String options) {
             if (options != null) {
+                List<String> optionSettings = new ArrayList<>();
                 for (String optionSetting : options.split("\\s+|#")) {
                     if (optionSetting.charAt(0) == '-') {
-                        OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=false", this, null);
+                        optionSettings.add(optionSetting.substring(1));
+                        optionSettings.add("false");
                     } else if (optionSetting.charAt(0) == '+') {
-                        OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=true", this, null);
+                        optionSettings.add(optionSetting.substring(1));
+                        optionSettings.add("true");
                     } else {
-                        OptionsParser.parseOptionSetting(optionSetting, this, null);
+                        OptionsParser.parseOptionSettingTo(optionSetting, optionSettings);
                     }
                 }
+                OptionsParser.parseOptions(optionSettings.toArray(new String[optionSettings.size()]), this, null, null);
             }
         }
 
--- a/mx.graal/suite.py	Fri Oct 16 00:17:53 2015 +0200
+++ b/mx.graal/suite.py	Fri Oct 16 00:18:47 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "2935e7fbd941d487513c60b875d9fc737674afdd",
+               "version" : "d43f6d932ad56c862decc160f19be413e2e03304",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},