--- a/test/hotspot/jtreg/compiler/jvmci/errors/CodeInstallerTest.java Wed May 01 12:41:26 2019 -0400
+++ b/test/hotspot/jtreg/compiler/jvmci/errors/CodeInstallerTest.java Wed May 01 12:31:29 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,7 +32,9 @@
import jdk.vm.ci.code.site.Site;
import jdk.vm.ci.hotspot.HotSpotCompiledCode;
import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
+import jdk.vm.ci.hotspot.HotSpotCompiledNmethod;
import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
import jdk.vm.ci.meta.Assumptions.Assumption;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.PlatformKind;
@@ -50,7 +52,7 @@
protected final MetaAccessProvider metaAccess;
protected final HotSpotConstantReflectionProvider constantReflection;
- protected final ResolvedJavaMethod dummyMethod;
+ protected final HotSpotResolvedJavaMethod dummyMethod;
public static void dummyMethod() {
}
@@ -69,12 +71,13 @@
Assert.fail();
}
- dummyMethod = metaAccess.lookupJavaMethod(method);
+ dummyMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
}
protected void installEmptyCode(Site[] sites, Assumption[] assumptions, Comment[] comments, int dataSectionAlignment, DataPatch[] dataSectionPatches, StackSlot deoptRescueSlot) {
- HotSpotCompiledCode code = new HotSpotCompiledCode("dummyMethod", new byte[0], 0, sites, assumptions, new ResolvedJavaMethod[]{dummyMethod}, comments, new byte[8], dataSectionAlignment,
- dataSectionPatches, false, 0, deoptRescueSlot);
+ HotSpotCompiledCode code = new HotSpotCompiledNmethod("dummyMethod", new byte[0], 0, sites, assumptions, new ResolvedJavaMethod[]{dummyMethod}, comments, new byte[8], dataSectionAlignment,
+ dataSectionPatches, false, 0, deoptRescueSlot,
+ dummyMethod, 0, 1, 0L, false);
codeCache.addCode(dummyMethod, code, null, null);
}