diff options
| author | Vladimír Dvo?ák <lada.dvorak7@gmail.com> | 2014-07-02 22:33:18 +0200 |
|---|---|---|
| committer | Vladimír Dvo?ák <lada.dvorak7@gmail.com> | 2014-07-02 22:33:18 +0200 |
| commit | 7d49f478c395864cb6fe06ecf838e25729cb01f4 (patch) | |
| tree | ab72e3684aa7c4273b74f1a00826e9223f863361 /hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch | |
| parent | d30fd49eae164275af27409cea684d9eb706b206 (diff) | |
| download | dcevm-7d49f478c395864cb6fe06ecf838e25729cb01f4.tar.gz dcevm-7d49f478c395864cb6fe06ecf838e25729cb01f4.zip | |
light-jdk7u51 deopt-cp patch. Indentation fix.
Diffstat (limited to 'hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch')
| -rw-r--r-- | hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch b/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch index eb770b6b..3b551f63 100644 --- a/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch +++ b/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch @@ -1,36 +1,30 @@ diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp -index a6d138b..f7e4e81 100644 +index a6d138b..731c75b 100644 --- a/src/share/vm/classfile/classFileParser.cpp +++ b/src/share/vm/classfile/classFileParser.cpp -@@ -3942,6 +3942,14 @@ +@@ -3942,6 +3942,11 @@ } } -+ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) -+ { ++ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) { + if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) -+ { + this_klass->set_deoptimization_incl(true); -+ } + } + if (TraceClassResolution) { // print out the superclass. const char * from = Klass::cast(this_klass())->external_name(); diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp -index fa45c6d..a28504d 100644 +index fa45c6d..6de52ce 100644 --- a/src/share/vm/classfile/systemDictionary.cpp +++ b/src/share/vm/classfile/systemDictionary.cpp -@@ -1255,6 +1255,14 @@ +@@ -1255,6 +1255,11 @@ } } -+ if (HotswapDeoptClassPath != NULL) -+ { ++ if (HotswapDeoptClassPath != NULL) { + if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) -+ { + ik->set_deoptimization_incl(true); -+ } + } + if (TraceClassLoading) { @@ -236,7 +230,7 @@ index ef4f380..5d2382c 100644 ResourceMark rm(THREAD); DeoptimizationMarker dm; diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp -index 634c589..eeb0558 100644 +index 634c589..5ccc302 100644 --- a/src/share/vm/runtime/globals.hpp +++ b/src/share/vm/runtime/globals.hpp @@ -3659,7 +3659,13 @@ @@ -250,7 +244,7 @@ index 634c589..eeb0558 100644 + "classes allowed to be deoptimized on hotswap. If is not " \ + "defined then all classes will be deoptimized on hotswap. " \ + "That's default behaviour. Using this option the performance " \ -+ "of hotswap can considerably increased. ") ++ "of hotswap can be considerably increased. ") /* * Macros for factoring of globals
\ No newline at end of file |