diff options
| author | Ivan Dubrov <dubrov.ivan@gmail.com> | 2015-03-14 08:41:01 -0700 |
|---|---|---|
| committer | Ivan Dubrov <dubrov.ivan@gmail.com> | 2015-03-14 08:41:01 -0700 |
| commit | 20e9948eef7f14c21c5d5aaead11cae27c131908 (patch) | |
| tree | 2d283a7895326f5a51ef9c2b8e808520fe8554c7 | |
| parent | 44575674cb65fa2f42bba0a72e5de014217d3cd1 (diff) | |
| parent | 909965796f70a0be425b072d47270454de8a89e6 (diff) | |
| download | dcevm-20e9948eef7f14c21c5d5aaead11cae27c131908.tar.gz dcevm-20e9948eef7f14c21c5d5aaead11cae27c131908.zip | |
Merge pull request #62 from skybber/master
TRACE gcc compilation problem resolved
| -rw-r--r-- | hotspot/.hg/patches/light-jdk8u20-b22.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hotspot/.hg/patches/light-jdk8u20-b22.patch b/hotspot/.hg/patches/light-jdk8u20-b22.patch index d9c14103..69bb6e48 100644 --- a/hotspot/.hg/patches/light-jdk8u20-b22.patch +++ b/hotspot/.hg/patches/light-jdk8u20-b22.patch @@ -1394,7 +1394,7 @@ index 0d6d00d..3b1866a 100644 for (PreviousVersionNode * pv_node = pvw.next_previous_version(); diff --git a/src/share/vm/prims/jvmtiRedefineClasses2.cpp b/src/share/vm/prims/jvmtiRedefineClasses2.cpp new file mode 100644 -index 0000000..1a0406e +index 0000000..dc76c3d --- /dev/null +++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp @@ -0,0 +1,2128 @@ @@ -2935,7 +2935,7 @@ index 0000000..1a0406e + for (int j = 0; j < _matching_methods_length; ++j) { + Method* old_method = _old_methods->at(_matching_old_methods[j]); + jmethodID jmid = old_method->find_jmethod_id_or_null(); -+ RC_TRACE(0x00008000, ("matching method %s, jmid %d", old_method->name_and_sig_as_C_string(), jmid)); ++ RC_TRACE(0x00008000, ("matching method %s, jmid %d", old_method->name_and_sig_as_C_string(), *((int *)&jmid))); + if (old_method->new_version() != NULL && jmid == NULL) { + // (DCEVM) Have to create jmethodID in this case + jmid = old_method->jmethod_id(); |