diff options
| author | Ivan Dubrov <dubrov.ivan@gmail.com> | 2014-06-06 14:08:45 -0700 |
|---|---|---|
| committer | Ivan Dubrov <dubrov.ivan@gmail.com> | 2014-06-06 14:08:45 -0700 |
| commit | 8c80de875e1e57224381148ebd292767eee6e1f3 (patch) | |
| tree | 72608d360ed32c49e83a0e712d9b3f1c07442243 /hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch | |
| parent | 1ef0347db43ad8640d38b16c5c6ba802d350f174 (diff) | |
| parent | 5a8846a81c9c3ee7854d4d0173bf6301d677107c (diff) | |
| download | dcevm-8c80de875e1e57224381148ebd292767eee6e1f3.tar.gz dcevm-8c80de875e1e57224381148ebd292767eee6e1f3.zip | |
Merge pull request #31 from skybber/master
Option -XX:HotswapDeoptClassPath in jdk7u51, indentation fixed
Diffstat (limited to 'hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch')
| -rw-r--r-- | hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch b/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch index 3e1b3cda..50b19993 100644 --- a/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch +++ b/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch @@ -1,5 +1,5 @@ diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp -index a6d138b..8edc030 100644 +index a6d138b..f7e4e81 100644 --- a/src/share/vm/classfile/classFileParser.cpp +++ b/src/share/vm/classfile/classFileParser.cpp @@ -3942,6 +3942,14 @@ @@ -8,17 +8,17 @@ index a6d138b..8edc030 100644 + if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) + { -+ if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) -+ { -+ this_klass->set_deoptimization_incl(true); -+ } ++ 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..a0a695b 100644 +index fa45c6d..a28504d 100644 --- a/src/share/vm/classfile/systemDictionary.cpp +++ b/src/share/vm/classfile/systemDictionary.cpp @@ -1255,6 +1255,14 @@ @@ -27,10 +27,10 @@ index fa45c6d..a0a695b 100644 + if (HotswapDeoptClassPath != NULL) + { -+ if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) -+ { -+ ik->set_deoptimization_incl(true); -+ } ++ if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) ++ { ++ ik->set_deoptimization_incl(true); ++ } + } + if (TraceClassLoading) { @@ -105,7 +105,7 @@ index 8d76afb..d2d1acc 100644 bool has_dependencies() { return dependencies_size() != 0; } diff --git a/src/share/vm/oops/klass.cpp b/src/share/vm/oops/klass.cpp -index 767588c..e84bc6f 100644 +index 767588c..6a195ab 100644 --- a/src/share/vm/oops/klass.cpp +++ b/src/share/vm/oops/klass.cpp @@ -57,7 +57,10 @@ @@ -114,8 +114,8 @@ index 767588c..e84bc6f 100644 - if (super() != NULL) set_super(super()->klass_part()->newest_version()); + if (super() != NULL) { -+ set_super(super()->klass_part()->newest_version()); -+ set_deoptimization_incl(super()->klass_part()->is_deoptimization_incl()); ++ set_super(super()->klass_part()->newest_version()); ++ set_deoptimization_incl(super()->klass_part()->is_deoptimization_incl()); + } for (uint i=0; i<primary_super_limit(); i++) { @@ -215,14 +215,14 @@ index 634c589..eeb0558 100644 /* * Macros for factoring of globals diff --git a/src/share/vm/runtime/sharedRuntime.cpp b/src/share/vm/runtime/sharedRuntime.cpp -index e0e19b1..ae28d1a 100644 +index e0e19b1..84ace41 100644 --- a/src/share/vm/runtime/sharedRuntime.cpp +++ b/src/share/vm/runtime/sharedRuntime.cpp @@ -2630,6 +2630,7 @@ sig_bt, regs, ret_type); -+ nm->set_deoptimization_incl(method->method_holder()->klass_part()->is_deoptimization_incl()); ++ nm->set_deoptimization_incl(method->method_holder()->klass_part()->is_deoptimization_incl()); } }
\ No newline at end of file |