Mercurial > hg > truffle
changeset 10216:39fba0d6d9ad
Merge
author | fparain |
---|---|
date | Fri, 03 May 2013 05:17:15 -0700 |
parents | 0380df7c3cd0 (diff) 31a4e55f8c9d (current diff) |
children | a55b7b8c34af |
files | |
diffstat | 3 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make Fri May 03 05:05:31 2013 -0700 +++ b/make/windows/makefiles/compile.make Fri May 03 05:17:15 2013 -0700 @@ -52,7 +52,7 @@ # improving the quality of crash log stack traces involving jvm.dll. # These are always used in all compiles -CXX_FLAGS=/nologo /W3 /WX +CXX_FLAGS=$(EXTRA_CFLAGS) /nologo /W3 /WX # Let's add debug information when Full Debug Symbols is enabled !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
--- a/make/windows/makefiles/defs.make Fri May 03 05:05:31 2013 -0700 +++ b/make/windows/makefiles/defs.make Fri May 03 05:17:15 2013 -0700 @@ -193,7 +193,7 @@ MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER) endif -NMAKE= MAKEFLAGS= MFLAGS= nmake -NOLOGO +NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO ifndef SYSTEM_UNAME SYSTEM_UNAME := $(shell uname) export SYSTEM_UNAME
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Fri May 03 05:05:31 2013 -0700 +++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Fri May 03 05:17:15 2013 -0700 @@ -513,6 +513,11 @@ AnnotationArray* param_anno = method->parameter_annotations(); AnnotationArray* default_anno = method->annotation_default(); + // skip generated default interface methods + if (method->is_overpass()) { + return; + } + write_u2(access_flags.get_flags() & JVM_RECOGNIZED_METHOD_MODIFIERS); write_u2(const_method->name_index()); write_u2(const_method->signature_index()); @@ -619,8 +624,19 @@ HandleMark hm(thread()); Array<Method*>* methods = ikh()->methods(); int num_methods = methods->length(); + int num_overpass = 0; - write_u2(num_methods); + // count the generated default interface methods + // these will not be re-created by write_method_info + // and should not be included in the total count + for (int index = 0; index < num_methods; index++) { + Method* method = methods->at(index); + if (method->is_overpass()) { + num_overpass++; + } + } + + write_u2(num_methods - num_overpass); if (JvmtiExport::can_maintain_original_method_order()) { int index; int original_index;