test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp

rev 52285 : 8212884: Remove the assignments in ifs for vmTestbase/[a-s]
Summary: Extract assignments from if statements in vmTestbase
Reviewed-by: cjplummer, sspitsyn

@@ -52,18 +52,19 @@
                         jobject o, jint ind, jbyteArray byteCode) {
 
     jbyte* elements;
     jboolean isCopy;
 
-    if (!NSK_JNI_VERIFY(jni_env, (newClassSize[ind] = jni_env->GetArrayLength(byteCode)) > 0)) {
+    newClassSize[ind] = jni_env->GetArrayLength(byteCode);
+    if (!NSK_JNI_VERIFY(jni_env, newClassSize[ind] > 0)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got array size: %d\n", newClassSize[ind]);
 
-    if (!NSK_JNI_VERIFY(jni_env, (elements =
-            jni_env->GetByteArrayElements(byteCode, &isCopy)) != NULL)) {
+    elements = jni_env->GetByteArrayElements(byteCode, &isCopy);
+    if (!NSK_JNI_VERIFY(jni_env, elements != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got elements list: 0x%p\n", (void*)elements);
 

@@ -94,12 +95,12 @@
  */
 JNIEXPORT void JNICALL
 Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t002_setClass(JNIEnv *jni_env,
                         jobject o, jint ind, jclass cls) {
 
-    if (!NSK_JNI_VERIFY(jni_env, (oldClassDef[ind].klass = (jclass)
-             jni_env->NewGlobalRef(cls)) != NULL)) {
+    oldClassDef[ind].klass = (jclass) jni_env->NewGlobalRef(cls);
+    if (!NSK_JNI_VERIFY(jni_env, oldClassDef[ind].klass != NULL)) {
         nsk_jvmti_setFailStatus();
     }
 }
 
 /* ============================================================================= */

@@ -253,11 +254,12 @@
     if (!NSK_VERIFY(nsk_jvmti_parseOptions(options)))
         return JNI_ERR;
 
     timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
 
-    if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
+    jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved);
+    if (!NSK_VERIFY(jvmti != NULL))
         return JNI_ERR;
 
     {
         jvmtiCapabilities caps;
         memset(&caps, 0, sizeof(caps));