You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

dont-clear-f1.patch 1.1KB

123456789101112131415161718192021222324252627
  1. # HG changeset patch
  2. # Parent 6f6f329e829b021b30ff9d2b21c1308f6427af2f
  3. diff -r 6f6f329e829b -r f41a9c701b38 src/share/vm/oops/cpCache.cpp
  4. --- a/src/share/vm/oops/cpCache.cpp Tue Apr 05 11:28:40 2016 -0700
  5. +++ b/src/share/vm/oops/cpCache.cpp Tue Apr 05 15:31:55 2016 -0700
  6. @@ -537,7 +537,7 @@
  7. // Clear cached entry, let it be re-resolved
  8. void ConstantPoolCacheEntry::clear_entry() {
  9. _indices = constant_pool_index();
  10. - _f1 = NULL;
  11. + //_f1 = NULL;
  12. if (!is_resolved_reference()) {
  13. _f2 = 0;
  14. }
  15. diff -r 6f6f329e829b -r f41a9c701b38 src/share/vm/oops/cpCache.hpp
  16. --- a/src/share/vm/oops/cpCache.hpp Tue Apr 05 11:28:40 2016 -0700
  17. +++ b/src/share/vm/oops/cpCache.hpp Tue Apr 05 15:31:55 2016 -0700
  18. @@ -141,7 +141,7 @@
  19. void set_bytecode_2(Bytecodes::Code code);
  20. void set_f1(Metadata* f1) {
  21. Metadata* existing_f1 = (Metadata*)_f1; // read once
  22. - assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
  23. + //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
  24. _f1 = f1;
  25. }
  26. void release_set_f1(Metadata* f1);