Mercurial > hg > graal-jvmci-8
changeset 23390:19855d029fc0
Remove support for patching Symbol pointers (JDK-8156768).
| author | Roland Schatz <roland.schatz@oracle.com> |
|---|---|
| date | Wed, 11 May 2016 16:41:28 +0200 |
| parents | f9aa6a496c06 |
| children | dd9f3badc978 |
| files | jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java src/share/vm/jvmci/jvmciCodeInstaller.cpp src/share/vm/jvmci/jvmciCompilerToVM.cpp src/share/vm/jvmci/jvmciJavaClasses.hpp src/share/vm/jvmci/systemDictionary_jvmci.hpp src/share/vm/jvmci/vmSymbols_jvmci.hpp |
| diffstat | 12 files changed, 0 insertions(+), 110 deletions(-) [+] |
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Wed May 11 16:41:28 2016 +0200 @@ -477,11 +477,6 @@ native String getSymbol(long metaspaceSymbol); /** - * Lookup a VMSymbol from a String. - */ - native long lookupSymbol(String symbol); - - /** * Looks for the next Java stack frame matching an entry in {@code methods}. * * @param frame the starting point of the search, where {@code null} refers to the topmost frame
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java Wed May 11 16:41:28 2016 +0200 @@ -39,6 +39,4 @@ Constant readNarrowKlassPointerConstant(Constant base, long displacement, CompressEncoding encoding); Constant readMethodPointerConstant(Constant base, long displacement); - - Constant readSymbolConstant(Constant base, long displacement); }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Wed May 11 16:41:28 2016 +0200 @@ -241,16 +241,4 @@ HotSpotResolvedJavaMethodImpl method = runtime.getCompilerToVM().getResolvedJavaMethod(baseObject, displacement); return HotSpotMetaspaceConstantImpl.forMetaspaceObject(method, false); } - - @Override - public Constant readSymbolConstant(Constant base, long displacement) { - int bits = runtime.getConfig().symbolPointerSize * Byte.SIZE; - long pointer = readRawValue(base, displacement, bits); - if (pointer == 0) { - return JavaConstant.NULL_POINTER; - } else { - String symbol = runtime.getCompilerToVM().getSymbol(pointer); - return new HotSpotSymbol(symbol, pointer).asConstant(); - } - } }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java Wed May 11 16:41:28 2016 +0200 @@ -77,15 +77,6 @@ return new HotSpotSignature(runtime, signature); } - public HotSpotSymbol lookupSymbol(String symbol) { - long pointer = runtime.getCompilerToVM().lookupSymbol(symbol); - if (pointer == 0) { - return null; - } else { - return new HotSpotSymbol(symbol, pointer); - } - } - /** * {@link Field} object of {@link Method#slot}. */
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java Wed May 11 16:41:28 2016 +0200 @@ -29,6 +29,4 @@ HotSpotResolvedObjectType asResolvedJavaType(); HotSpotResolvedJavaMethod asResolvedJavaMethod(); - - HotSpotSymbol asSymbol(); }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java Wed May 11 21:20:50 2016 +0200 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java Wed May 11 16:41:28 2016 +0200 @@ -108,11 +108,4 @@ } return null; } - - public HotSpotSymbol asSymbol() { - if (metaspaceObject instanceof HotSpotSymbol) { - return (HotSpotSymbol) metaspaceObject; - } - return null; - } }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java Wed May 11 21:20:50 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package jdk.vm.ci.hotspot; - -import jdk.vm.ci.meta.Constant; - -/** - * Class to access the C++ {@code vmSymbols} table. - */ -public final class HotSpotSymbol implements MetaspaceWrapperObject { - - private final String symbol; - private final long pointer; - - HotSpotSymbol(String symbol, long pointer) { - this.symbol = symbol; - this.pointer = pointer; - } - - public String getSymbol() { - return symbol; - } - - public Constant asConstant() { - return HotSpotMetaspaceConstantImpl.forMetaspaceObject(this, false); - } - - @Override - public long getMetaspacePointer() { - return pointer; - } - - @Override - public String toString() { - return "Symbol<" + symbol + ">"; - } -}
--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp Wed May 11 21:20:50 2016 +0200 +++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp Wed May 11 16:41:28 2016 +0200 @@ -179,11 +179,6 @@ int index = _oop_recorder->find_index(method); TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), method->name()->as_C_string()); return method; - } else if (obj->is_a(HotSpotSymbol::klass())) { - Symbol* symbol = (Symbol*) (address) HotSpotSymbol::pointer(obj); - assert(!HotSpotMetaspaceConstantImpl::compressed(constant), err_msg("unexpected compressed symbol pointer %s @ " INTPTR_FORMAT, symbol->as_C_string(), p2i(symbol))); - TRACE_jvmci_3("symbol = %s", symbol->as_C_string()); - return symbol; } else { JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", obj->klass()->signature_name()); }
--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp Wed May 11 21:20:50 2016 +0200 +++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp Wed May 11 16:41:28 2016 +0200 @@ -813,11 +813,6 @@ return JNIHandles::make_local(THREAD, sym()); C2V_END -C2V_VMENTRY(jlong, lookupSymbol, (JNIEnv*, jobject, jobject string)) - Symbol* symbol = java_lang_String::as_symbol_or_null(JNIHandles::resolve(string)); - return (jlong) symbol; -C2V_END - bool matches(jobjectArray methods, Method* method) { objArrayOop methods_oop = (objArrayOop) JNIHandles::resolve(methods); @@ -1243,7 +1238,6 @@ {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)}, {CC"hasCompiledCodeForOSR", CC"("HS_RESOLVED_METHOD"II)Z", FN_PTR(hasCompiledCodeForOSR)}, {CC"getSymbol", CC"(J)"STRING, FN_PTR(getSymbol)}, - {CC"lookupSymbol", CC"("STRING")J", FN_PTR(lookupSymbol)}, {CC"getNextStackFrame", CC"("HS_STACK_FRAME_REF "["RESOLVED_METHOD"I)"HS_STACK_FRAME_REF, FN_PTR(getNextStackFrame)}, {CC"materializeVirtualObjects", CC"("HS_STACK_FRAME_REF"Z)V", FN_PTR(materializeVirtualObjects)}, {CC"shouldDebugNonSafepoints", CC"()Z", FN_PTR(shouldDebugNonSafepoints)},
--- a/src/share/vm/jvmci/jvmciJavaClasses.hpp Wed May 11 21:20:50 2016 +0200 +++ b/src/share/vm/jvmci/jvmciJavaClasses.hpp Wed May 11 16:41:28 2016 +0200 @@ -63,9 +63,6 @@ start_class(HotSpotResolvedJavaMethodImpl) \ long_field(HotSpotResolvedJavaMethodImpl, metaspaceMethod) \ end_class \ - start_class(HotSpotSymbol) \ - long_field(HotSpotSymbol, pointer) \ - end_class \ start_class(InstalledCode) \ long_field(InstalledCode, address) \ long_field(InstalledCode, entryPoint) \
--- a/src/share/vm/jvmci/systemDictionary_jvmci.hpp Wed May 11 21:20:50 2016 +0200 +++ b/src/share/vm/jvmci/systemDictionary_jvmci.hpp Wed May 11 16:41:28 2016 +0200 @@ -46,7 +46,6 @@ do_klass(HotSpotJVMCIMetaAccessContext_klass, jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext, Jvmci) \ do_klass(HotSpotJVMCIRuntime_klass, jdk_vm_ci_hotspot_HotSpotJVMCIRuntime, Jvmci) \ do_klass(HotSpotSpeculationLog_klass, jdk_vm_ci_hotspot_HotSpotSpeculationLog, Jvmci) \ - do_klass(HotSpotSymbol_klass, jdk_vm_ci_hotspot_HotSpotSymbol, Jvmci) \ do_klass(Assumptions_ConcreteMethod_klass, jdk_vm_ci_meta_Assumptions_ConcreteMethod, Jvmci) \ do_klass(Assumptions_NoFinalizableSubclass_klass, jdk_vm_ci_meta_Assumptions_NoFinalizableSubclass, Jvmci) \ do_klass(Assumptions_ConcreteSubtype_klass, jdk_vm_ci_meta_Assumptions_ConcreteSubtype, Jvmci) \
--- a/src/share/vm/jvmci/vmSymbols_jvmci.hpp Wed May 11 21:20:50 2016 +0200 +++ b/src/share/vm/jvmci/vmSymbols_jvmci.hpp Wed May 11 16:41:28 2016 +0200 @@ -47,7 +47,6 @@ template(jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext, "jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext") \ template(jdk_vm_ci_hotspot_HotSpotJVMCIRuntime, "jdk/vm/ci/hotspot/HotSpotJVMCIRuntime") \ template(jdk_vm_ci_hotspot_HotSpotSpeculationLog, "jdk/vm/ci/hotspot/HotSpotSpeculationLog") \ - template(jdk_vm_ci_hotspot_HotSpotSymbol, "jdk/vm/ci/hotspot/HotSpotSymbol") \ template(jdk_vm_ci_meta_JavaConstant, "jdk/vm/ci/meta/JavaConstant") \ template(jdk_vm_ci_meta_PrimitiveConstant, "jdk/vm/ci/meta/PrimitiveConstant") \ template(jdk_vm_ci_meta_RawConstant, "jdk/vm/ci/meta/RawConstant") \