src/share/vm/prims/whitebox.cpp

rev 7259 : 8043125: compiler/types/correctness/CorrectnessTest.java: assert(layout->tag() == DataLayout::speculative_trap_data_tag) failed: wrong type
Reviewed-by:

*** 516,535 ****
    bool do_object_b(oop p) { return false; }
  };
  
  static AlwaysFalseClosure always_false;
  
- class VM_WhiteBoxCleanMethodData : public VM_WhiteBoxOperation {
-  public:
-   VM_WhiteBoxCleanMethodData(MethodData* mdo) : _mdo(mdo) { }
-   void doit() {
-     _mdo->clean_method_data(&always_false);
-   }
-  private:
-   MethodData* _mdo;
- };
- 
  WB_ENTRY(void, WB_ClearMethodState(JNIEnv* env, jobject o, jobject method))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
    CHECK_JNI_EXCEPTION(env);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    MutexLockerEx mu(Compile_lock);
--- 516,525 ----
*** 541,552 ****
      ResourceMark rm;
      int arg_count = mdo->method()->size_of_parameters();
      for (int i = 0; i < arg_count; i++) {
        mdo->set_arg_modified(i, 0);
      }
!     VM_WhiteBoxCleanMethodData op(mdo);
!     VMThread::execute(&op);
    }
  
    mh->clear_not_c1_compilable();
    mh->clear_not_c2_compilable();
    mh->clear_not_c2_osr_compilable();
--- 531,542 ----
      ResourceMark rm;
      int arg_count = mdo->method()->size_of_parameters();
      for (int i = 0; i < arg_count; i++) {
        mdo->set_arg_modified(i, 0);
      }
!     MutexLockerEx mu(mdo->extra_data_lock());
!     mdo->clean_method_data(&always_false);
    }
  
    mh->clear_not_c1_compilable();
    mh->clear_not_c2_compilable();
    mh->clear_not_c2_osr_compilable();