src/share/vm/opto/callGenerator.cpp

rev 8961 : [mq]: diff-shenandoah.patch

*** 983,993 ****
  #ifdef ASSERT
      // Assert(no_new_memory && no_new_io && no_new_exceptions) after generate_predicate.
      assert(old_jvms == kit.jvms(), "generate_predicate should not change jvm state");
      SafePointNode* new_map = kit.map();
      assert(old_io  == new_map->i_o(), "generate_predicate should not change i_o");
!     assert(old_mem == new_map->memory(), "generate_predicate should not change memory");
      assert(old_exc == new_map->next_exception(), "generate_predicate should not add exceptions");
  #endif
      if (!kit.stopped()) {
        PreserveJVMState pjvms(&kit);
        // Generate intrinsic code:
--- 983,993 ----
  #ifdef ASSERT
      // Assert(no_new_memory && no_new_io && no_new_exceptions) after generate_predicate.
      assert(old_jvms == kit.jvms(), "generate_predicate should not change jvm state");
      SafePointNode* new_map = kit.map();
      assert(old_io  == new_map->i_o(), "generate_predicate should not change i_o");
!     assert(old_mem == new_map->memory() || UseShenandoahGC, "generate_predicate should not change memory");
      assert(old_exc == new_map->next_exception(), "generate_predicate should not add exceptions");
  #endif
      if (!kit.stopped()) {
        PreserveJVMState pjvms(&kit);
        // Generate intrinsic code: