src/share/vm/jvmci/jvmciCompilerToVM.cpp

*** 1118,1128 ****
            } else {
              ScopeDesc* scope = cvf->scope();
              // native wrapper do not have a scope
              if (scope != NULL && scope->objects() != NULL) {
                bool realloc_failures = Deoptimization::realloc_objects(thread, fst.current(), scope->objects(), THREAD);
!               Deoptimization::reassign_fields(fst.current(), fst.register_map(), scope->objects(), realloc_failures, false);
  
                GrowableArray<ScopeValue*>* local_values = scope->locals();
                typeArrayHandle array = oopFactory::new_boolArray(local_values->length(), thread);
                for (int i = 0; i < local_values->length(); i++) {
                  ScopeValue* value = local_values->at(i);
--- 1118,1128 ----
            } else {
              ScopeDesc* scope = cvf->scope();
              // native wrapper do not have a scope
              if (scope != NULL && scope->objects() != NULL) {
                bool realloc_failures = Deoptimization::realloc_objects(thread, fst.current(), scope->objects(), THREAD);
!               Deoptimization::reassign_fields(fst.current(), fst.register_map(), scope->objects(), realloc_failures, false, THREAD);
  
                GrowableArray<ScopeValue*>* local_values = scope->locals();
                typeArrayHandle array = oopFactory::new_boolArray(local_values->length(), thread);
                for (int i = 0; i < local_values->length(); i++) {
                  ScopeValue* value = local_values->at(i);
*** 1284,1294 ****
      // no objects to materialize
      return;
    }
  
    bool realloc_failures = Deoptimization::realloc_objects(thread, fstAfterDeopt.current(), objects, THREAD);
!   Deoptimization::reassign_fields(fstAfterDeopt.current(), fstAfterDeopt.register_map(), objects, realloc_failures, false);
  
    for (int frame_index = 0; frame_index < virtualFrames->length(); frame_index++) {
      compiledVFrame* cvf = virtualFrames->at(frame_index);
  
      GrowableArray<ScopeValue*>* scopeLocals = cvf->scope()->locals();
--- 1284,1294 ----
      // no objects to materialize
      return;
    }
  
    bool realloc_failures = Deoptimization::realloc_objects(thread, fstAfterDeopt.current(), objects, THREAD);
!   Deoptimization::reassign_fields(fstAfterDeopt.current(), fstAfterDeopt.register_map(), objects, realloc_failures, false, THREAD);
  
    for (int frame_index = 0; frame_index < virtualFrames->length(); frame_index++) {
      compiledVFrame* cvf = virtualFrames->at(frame_index);
  
      GrowableArray<ScopeValue*>* scopeLocals = cvf->scope()->locals();