From 6e658162caecbb8cd6711a48f60c4ed46c1b2615 Mon Sep 17 00:00:00 2001 From: Nikita Nemkin Date: Thu, 4 Apr 2019 19:48:33 +0500 Subject: Bug 546144 - [JNI] Revert some recent jnigen changes Revert "Bug 515610 - [GTK] SWT generates incorrect fall-through for memmove()" This reverts commit 4c3b9d2b9864a1910c5116168456ab215a2dc2aa. Change-Id: Iea193f29a877face605deaa51bfce96027f7d7ac Signed-off-by: Nikita Nemkin --- .../swt/tools/internal/NativesGenerator.java | 24 ++------- .../Eclipse SWT PI/cocoa/library/os.c | 36 +++++-------- .../Eclipse SWT PI/common/library/c.c | 27 ++++------ .../Eclipse SWT PI/gtk/library/os.c | 60 ++++++++-------------- 4 files changed, 44 insertions(+), 103 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java index 5816ce8fdb..5e67b4285b 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java @@ -11,7 +11,6 @@ * Contributors: * IBM Corporation - initial API and implementation * Red Hat Inc. - stop generating pre 1.2 JNI code - * Martin Oberhuber (WindRiver) - [515610] Fix incorrect code for memmove() *******************************************************************************/ package org.eclipse.swt.tools.internal; @@ -268,26 +267,9 @@ boolean generateGetParameter(JNIMethod method, JNIParameter param, boolean criti if (paramType.isPrimitive() || isSystemClass(paramType)) return false; String iStr = String.valueOf(param.getParameter()); for (int j = 0; j < indent; j++) output("\t"); - //if(!paramType.isArray() && !paramType.isType("java.lang.String") && param.getFlag(FLAG_NO_IN)) { - if("memmove".equals(method.getName()) && param.getFlag(FLAG_NO_IN)) { - // Bug 515610: Fix incorect fall-through for memmove(). - // A similar issue might be present in other cases as well. - // Keep diagnostic code (commented-out) below for diagnosing these. - output("if (!arg"); - output(iStr); - outputln(") goto fail;"); - //output(") {fprintf(stderr,\"fail: method="); - //output(method.getName()); - //output(", arg"); - //output(iStr); - //output("\\n\"); goto fail;}\n"); - for (int j = 0; j < indent; j++) output("\t"); - output("if ((lparg"); - } else { - output("if (arg"); - output(iStr); - output(") if ((lparg"); - } + output("if (arg"); + output(iStr); + output(") if ((lparg"); output(iStr); output(" = "); boolean isCPP = getCPP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c index 84d7d2e36b..75c8da39ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c @@ -6660,8 +6660,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CFRang #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCFRangeFields(env, arg0, lparg0); @@ -6686,8 +6685,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGAffi #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCGAffineTransformFields(env, arg0, lparg0); @@ -6712,8 +6710,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPath #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCGPathElementFields(env, arg0, lparg0); @@ -6738,8 +6735,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoin #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCGPointFields(env, arg0, lparg0); @@ -6764,8 +6760,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0); @@ -6790,8 +6785,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCGSizeFields(env, arg0, lparg0); @@ -6816,8 +6810,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CTPara #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setCTParagraphStyleSettingFields(env, arg0, lparg0); @@ -6842,8 +6835,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffi #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setNSAffineTransformStructFields(env, arg0, lparg0); @@ -6868,8 +6860,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoin #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0); @@ -6894,8 +6885,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRang #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0); @@ -6920,8 +6910,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0); @@ -6946,8 +6935,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize #else OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC); #endif - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (void *)arg1, arg2); fail: if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c index 8543a5b651..b626890a69 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c @@ -187,8 +187,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ) { jbyte *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -203,8 +202,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ) jbyte *lparg0=NULL; jchar *lparg1=NULL; C_NATIVE_ENTER(env, that, memmove___3B_3CJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)lparg1, (size_t)arg2); fail: @@ -220,8 +218,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ) { jchar *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -235,8 +232,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ) { jdouble *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -250,8 +246,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ) { jfloat *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -265,8 +260,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ) { jint *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -282,8 +276,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ) jbyte *lparg1=NULL; C_NATIVE_ENTER(env, that, memmove___3I_3BJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)lparg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -298,8 +291,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ) { jlong *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); @@ -313,8 +305,7 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ) { jshort *lparg0=NULL; C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 1848fb0348..b1acaff1d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -18177,8 +18177,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQue { GTypeQuery _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0); @@ -18192,8 +18191,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventButton _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventButtonFields(env, arg0, lparg0); @@ -18207,8 +18205,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventCrossing _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventCrossingFields(env, arg0, lparg0); @@ -18222,8 +18219,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventFocus _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventFocusFields(env, arg0, lparg0); @@ -18237,8 +18233,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventKey _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventKeyFields(env, arg0, lparg0); @@ -18252,8 +18247,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventMotion _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventMotionFields(env, arg0, lparg0); @@ -18267,8 +18261,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent { GdkEventWindowState _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkEventWindowStateFields(env, arg0, lparg0); @@ -18282,8 +18275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkKeyma { GdkKeymapKey _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkKeymapKey_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkKeymapKeyFields(env, arg0, lparg0); @@ -18297,8 +18289,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_ { GdkRGBA _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRGBA_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0); @@ -18312,8 +18303,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRecta { GdkRectangle _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGdkRectangleFields(env, arg0, lparg0); @@ -18327,8 +18317,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorde { GtkBorder _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setGtkBorderFields(env, arg0, lparg0); @@ -18362,8 +18351,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAtt { PangoAttrColor _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttrColorFields(env, arg0, lparg0); @@ -18377,8 +18365,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAtt { PangoAttrInt _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttrIntFields(env, arg0, lparg0); @@ -18392,8 +18379,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAtt { PangoAttribute _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoAttributeFields(env, arg0, lparg0); @@ -18407,8 +18393,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoIte { PangoItem _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoItemFields(env, arg0, lparg0); @@ -18422,8 +18407,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLay { PangoLayoutLine _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLayoutLineFields(env, arg0, lparg0); @@ -18437,8 +18421,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLay { PangoLayoutRun _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLayoutRunFields(env, arg0, lparg0); @@ -18452,8 +18435,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLog { PangoLogAttr _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setPangoLogAttrFields(env, arg0, lparg0); @@ -18467,8 +18449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeE { XExposeEvent _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setXExposeEventFields(env, arg0, lparg0); @@ -18482,8 +18463,7 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusCh { XFocusChangeEvent _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC); - if (!arg0) goto fail; - if ((lparg0 = &_arg0) == NULL) goto fail; + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); fail: if (arg0 && lparg0) setXFocusChangeEventFields(env, arg0, lparg0); -- cgit v1.2.3