test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp

rev 52028 : 8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]
Summary:
Reviewed-by:

*** 122,132 ****
  /************************/
  
  JNIEXPORT void JNICALL
  Java_nsk_jvmti_scenarios_allocation_AP06_ap06t001Thread_setTag( JNIEnv* jni, jobject obj) {
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, obj, threadTag))) {
          nsk_jvmti_setFailStatus();
      } else {
          NSK_DISPLAY0("setTag: the tag was set for checked thread.");
      }
  }
--- 122,132 ----
  /************************/
  
  JNIEXPORT void JNICALL
  Java_nsk_jvmti_scenarios_allocation_AP06_ap06t001Thread_setTag( JNIEnv* jni, jobject obj) {
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, threadTag))) {
          nsk_jvmti_setFailStatus();
      } else {
          NSK_DISPLAY0("setTag: the tag was set for checked thread.");
      }
  }
*** 151,185 ****
              nsk_jvmti_setFailStatus();
              break;
          }
  
          if (!NSK_JNI_VERIFY(jni, (fid =
!                 NSK_CPP_STUB4(GetStaticFieldID, jni,
!                                                 debugeeClass,
!                                                 "thread",
!                                                 THREAD_CLS_SIGNATURE)) != NULL )) {
              nsk_jvmti_setFailStatus();
              break;
          }
  
          if (!NSK_JNI_VERIFY(jni, (localRefThread =
!                 NSK_CPP_STUB3(GetStaticObjectField, jni,
!                                                     debugeeClass,
!                                                     fid )) != NULL )) {
              NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'thread' field value\n\n");
              nsk_jvmti_setFailStatus();
              break;
          }
  
!         if (!NSK_JNI_VERIFY(jni, (globalRefThread =
!                  NSK_CPP_STUB2(NewGlobalRef, jni, localRefThread)) != NULL))
              return;
  
          NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
!                                                            heapRootCallback,
                                                             stackReferenceCallback,
                                                             objectReferenceCallback,
                                                             NULL /*user_data*/))) {
              nsk_jvmti_setFailStatus();
              break;
--- 151,177 ----
              nsk_jvmti_setFailStatus();
              break;
          }
  
          if (!NSK_JNI_VERIFY(jni, (fid =
!                 jni->GetStaticFieldID(debugeeClass, "thread", THREAD_CLS_SIGNATURE)) != NULL )) {
              nsk_jvmti_setFailStatus();
              break;
          }
  
          if (!NSK_JNI_VERIFY(jni, (localRefThread =
!                 jni->GetStaticObjectField(debugeeClass, fid)) != NULL )) {
              NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'thread' field value\n\n");
              nsk_jvmti_setFailStatus();
              break;
          }
  
!         if (!NSK_JNI_VERIFY(jni, (globalRefThread = jni->NewGlobalRef(localRefThread)) != NULL))
              return;
  
          NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
!         if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
                                                                   stackReferenceCallback,
                                                                   objectReferenceCallback,
                                                                   NULL /*user_data*/))) {
              nsk_jvmti_setFailStatus();
              break;
*** 232,247 ****
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(jvmtiCapabilities));
      caps.can_tag_objects = 1;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
!             jvmti, &caps)))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
!             jvmti, &caps)))
          return JNI_ERR;
  
      if (!caps.can_tag_objects)
          NSK_DISPLAY0("Warning: tagging objects is not implemented\n");
  
--- 224,237 ----
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(jvmtiCapabilities));
      caps.can_tag_objects = 1;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
          return JNI_ERR;
  
      if (!caps.can_tag_objects)
          NSK_DISPLAY0("Warning: tagging objects is not implemented\n");