Mercurial > hg > graal-compiler
changeset 22566:e0bcb1f067cd
Update jvmci.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 01 Sep 2015 14:49:24 +0200 |
parents | 0aa6f25c46ca |
children | 6de3a450bc17 |
files | graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java mx.graal/suite.py |
diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Tue Sep 01 12:21:11 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Tue Sep 01 14:49:24 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. 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 @@ -54,7 +54,7 @@ HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method; HotSpotNmethod installedCode = new HotSpotNmethod(hsMethod, compResult.getName(), true); HotSpotCompiledNmethod compiledNmethod = new HotSpotCompiledNmethod(hsMethod, compResult); - int result = runtime().getCompilerToVM().installCode(compiledNmethod, installedCode, null); + int result = runtime().getCompilerToVM().installCode(getTarget(), compiledNmethod, installedCode, null); HotSpotVMConfig config = runtime().getConfig(); Assert.assertEquals("Error installing method " + method + ": " + config.getCodeInstallResultDescription(result), result, config.codeInstallResultOk);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Tue Sep 01 12:21:11 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Tue Sep 01 14:49:24 2015 +0200 @@ -29,13 +29,13 @@ import jdk.internal.jvmci.code.*; import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import com.oracle.graal.debug.internal.*; import jdk.internal.jvmci.hotspot.*; import jdk.internal.jvmci.meta.*; import com.oracle.graal.compiler.target.*; +import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.internal.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.hotspot.nodes.*; @@ -194,7 +194,7 @@ HotSpotCompiledCode hsCompResult = new HotSpotCompiledRuntimeStub(compResult); HotSpotGraalRuntime runtime = runtime(); - int result = runtime.getCompilerToVM().installCode(hsCompResult, installedCode, null); + int result = runtime.getCompilerToVM().installCode(backend.getTarget(), hsCompResult, installedCode, null); HotSpotVMConfig config = runtime.getConfig(); if (result != config.codeInstallResultOk) { throw new JVMCIError("Error installing stub %s: %s", Stub.this, config.getCodeInstallResultDescription(result));
--- a/mx.graal/suite.py Tue Sep 01 12:21:11 2015 +0200 +++ b/mx.graal/suite.py Tue Sep 01 14:49:24 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "740feb10d15ac991d2565f400aedb7b2b3287f67", + "version" : "90c4254dc25aebe42e0140f67b1026d44e665b4c", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},