mirrors
/
dcevm
mirror of https://github.com/dcevm/dcevm.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 31 Wiki Activity
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.
224 Commits
4 Branches
Tree: 9befffa90f
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '9befffa90f'
${ noResults }
dcevm/hotspot/.hg/patches/dont-clear-f1.patch

dont-clear-f1.patch 2.5KB
Raw Blame History

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 
  1. # HG changeset patch

  2. # Parent  89c7125da633a3b47b117c4c7ccbc60b6daa7581

  3. 

  4. diff -r 89c7125da633 src/share/vm/oops/cpCache.cpp

  5. --- a/src/share/vm/oops/cpCache.cpp	Wed Apr 06 12:04:17 2016 -0700

  6. +++ b/src/share/vm/oops/cpCache.cpp	Wed Apr 06 20:11:06 2016 -0700

  7. @@ -536,17 +536,22 @@

  8.  // Enhanced RedefineClasses() API support (DCEVM):

  9.  // Clear cached entry, let it be re-resolved

  10.  void ConstantPoolCacheEntry::clear_entry() {

  11. +  // Always clear for invokehandle/invokedynamic to re-resolve them

  12. +  bool clearData = bytecode_1() == Bytecodes::_invokehandle || bytecode_1() == Bytecodes::_invokedynamic;

  13.    _indices = constant_pool_index();

  14. -  _f1 = NULL;

  15. -  if (!is_resolved_reference()) {

  16. -    _f2 = 0;

  17. +

  18. +  if (clearData) {

  19. +    if (!is_resolved_reference()) {

  20. +      _f2 = 0;

  21. +    }

  22. +    // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used

  23. +    // after we return from the method, before entry is re-initialized. So let's

  24. +    // keep parameter size the same.

  25. +    // For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for

  26. +    // Also, we need to keep flag marking entry as one containing resolved_reference

  27. +    _flags &= parameter_size_mask | (1 << is_resolved_ref_shift);

  28. +    _f1 = NULL;

  29.    }

  30. -  // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used

  31. -  // after we return from the method, before entry is re-initialized. So let's

  32. -  // keep parameter size the same.

  33. -  // For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for

  34. -  // Also, we need to keep flag marking entry as one containing resolved_reference

  35. -  _flags &= parameter_size_mask | (1 << is_resolved_ref_shift);

  36.  }

  37.  #endif // INCLUDE_JVMTI

  38.  

  39. diff -r 89c7125da633 src/share/vm/oops/cpCache.hpp

  40. --- a/src/share/vm/oops/cpCache.hpp	Wed Apr 06 12:04:17 2016 -0700

  41. +++ b/src/share/vm/oops/cpCache.hpp	Wed Apr 06 20:11:06 2016 -0700

  42. @@ -141,13 +141,13 @@

  43.    void set_bytecode_2(Bytecodes::Code code);

  44.    void set_f1(Metadata* f1) {

  45.      Metadata* existing_f1 = (Metadata*)_f1; // read once

  46. -    assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");

  47. +    //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");

  48.      _f1 = f1;

  49.    }

  50.    void release_set_f1(Metadata* f1);

  51.    void set_f2(intx f2) {

  52.      intx existing_f2 = _f2; // read once

  53. -    assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");

  54. +    //assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");

  55.      _f2 = f2;

  56.    }

  57.    void set_f2_as_vfinal_method(Method* f2) {