Mercurial > hg > truffle
changeset 4475:f400f9554f09
fixed windows build, filtered methodDataOop for reflection
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Mon, 06 Feb 2012 18:32:30 -0800 |
parents | bae534c93335 |
children | 00efac2934d3 |
files | src/share/tools/ProjectCreator/BuildConfig.java src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/runtime/reflectionUtils.cpp src/share/vm/runtime/vmStructs.cpp |
diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/tools/ProjectCreator/BuildConfig.java Mon Feb 06 18:03:24 2012 -0800 +++ b/src/share/tools/ProjectCreator/BuildConfig.java Mon Feb 06 18:32:30 2012 -0800 @@ -68,6 +68,15 @@ if (value != null) { outDir = value; } + if (outDir.endsWith("debug")) { + outDir = outDir.substring(0, outDir.lastIndexOf("debug") - 1); + } else if(outDir.endsWith("fastdebug")) { + outDir = outDir.substring(0, outDir.lastIndexOf("fastdebug") - 1); + } + + if (!build.equals("product")) { + outDir += Util.sep + build; + } outDir += Util.sep + "jre" + Util.sep + "bin"; if (flavour.equals("compiler1")) { outDir += Util.sep + "graal";
--- a/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 06 18:03:24 2012 -0800 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 06 18:32:30 2012 -0800 @@ -195,7 +195,7 @@ if(method_data.is_null()) { return NULL; } else { - Handle graalMethodData = GraalCompiler::createHotSpotMethodData(method_data, THREAD); + Handle graalMethodData = GraalCompiler::createHotSpotMethodData(method_data, CHECK_NULL); return JNIHandles::make_local(THREAD, graalMethodData()); } }
--- a/src/share/vm/runtime/reflectionUtils.cpp Mon Feb 06 18:03:24 2012 -0800 +++ b/src/share/vm/runtime/reflectionUtils.cpp Mon Feb 06 18:32:30 2012 -0800 @@ -82,6 +82,8 @@ if (UseGraal) { compute_offset(offset, SystemDictionary::HotSpotMethodResolved_klass(), "javaMirror", "Ljava/lang/Object;", false); _filtered_fields->append(new FilteredField(SystemDictionary::HotSpotMethodResolved_klass(), offset)); + compute_offset(offset, SystemDictionary::HotSpotMethodData_klass(), "hotspotMirror", "Ljava/lang/Object;", false); + _filtered_fields->append(new FilteredField(SystemDictionary::HotSpotMethodData_klass(), offset)); } #endif }
--- a/src/share/vm/runtime/vmStructs.cpp Mon Feb 06 18:03:24 2012 -0800 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Feb 06 18:32:30 2012 -0800 @@ -359,7 +359,6 @@ nonstatic_field(methodDataOopDesc, _arg_local, intx) \ nonstatic_field(methodDataOopDesc, _arg_stack, intx) \ nonstatic_field(methodDataOopDesc, _arg_returned, intx) \ - nonstatic_field(methodDataOopDesc, _graal_mirror, oop) \ nonstatic_field(methodOopDesc, _constMethod, constMethodOop) \ nonstatic_field(methodOopDesc, _constants, constantPoolOop) \ nonstatic_field(methodOopDesc, _method_data, methodDataOop) \