Mercurial > hg > graal-compiler
changeset 22676:1ec6d2962ff5
adapted CompileTheWorld for switch to -Djvmci.option.<name>=<value> format
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 22 Sep 2015 23:12:56 +0200 |
parents | 8030c4d38715 |
children | 4ea1c903f00f |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java mx.graal/suite.py |
diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Sep 22 13:23:15 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Sep 22 23:12:56 2015 +0200 @@ -108,14 +108,19 @@ /** * Creates a {@link Config} object by parsing a set of space separated override options. * - * @param options a space or hash separated set of option value settings with each option - * setting in a format compatible with {@link OptionsParser#parseOption}. Ignored - * if null. + * @param options a space separated set of option value settings with each option setting in + * a -G:<value> format but without the leading "-G:". Ignored if null. */ public Config(String options) { if (options != null) { - for (String option : options.split("\\s+|#")) { - OptionsParser.parseOption(option, this, null); + for (String optionSetting : options.split("\\s+|#")) { + if (optionSetting.charAt(0) == '-') { + OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=false", this, null); + } else if (optionSetting.charAt(0) == '+') { + OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=true", this, null); + } else { + OptionsParser.parseOptionSetting(optionSetting, this, null); + } } } }
--- a/mx.graal/suite.py Tue Sep 22 13:23:15 2015 -0700 +++ b/mx.graal/suite.py Tue Sep 22 23:12:56 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "a4b63f56bc974ded88648d0e0149bf1ba6887d28", + "version" : "d3930fdd1eb3e9edcca8d585eb5394fc09aa9a2c", "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"},