Mercurial > hg > graal-compiler
changeset 22765:a11240648dc3
Call JVMCI.initialize when Debug class is loaded to make sure properties are loaded
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Wed, 30 Sep 2015 15:40:22 +0200 |
parents | 40a8dedf1554 |
children | 582a97b6fdd1 c69bbc0b9ea7 |
files | graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java mx.graal/suite.py |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Tue Oct 06 16:51:30 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Wed Sep 30 15:40:22 2015 +0200 @@ -34,12 +34,15 @@ import java.util.ArrayList; import java.util.List; +import jdk.internal.jvmci.runtime.JVMCI; import jdk.internal.jvmci.service.Services; public class DebugEnvironment { public static GraalDebugConfig initialize(PrintStream log) { - + // Initialize JVMCI before loading class Debug to make sure, properties are loaded + // (especially Debug=...) + JVMCI.initialize(); if (!Debug.isEnabled()) { log.println("WARNING: Scope debugging needs to be enabled with -esa or -D" + Debug.Initialization.INITIALIZER_PROPERTY_NAME + "=true"); return null;
--- a/mx.graal/suite.py Tue Oct 06 16:51:30 2015 +0200 +++ b/mx.graal/suite.py Wed Sep 30 15:40:22 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "9203f93ffeb0957968a092c7752ef5c755f91a2a", + "version" : "897914fce4cbe73f18719388e8bd6e0a1869ad11", "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"},