From b7a7351767bc58bc7e8719972e309a1e9f23967c Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Mon, 16 Oct 2023 17:21:08 +0200
Subject: [PATCH] JNI: treat equivalent C++ types as the same JNI types as well

Our signature mapping treats both e.g. bool and jboolean as "Z", and it
is allowed to pass a bool variable as an argument to a function expecting
a jboolean. Except for fields and callMethod return values, where we only
allowed the JNI primitive types.

Fix this by comparing the signatures and size of the type we have with
the JNI types that there are explicit functions for. Cast from and to
the JNI type in both directions to address narrowing (e.g. jboolean is an
unsigned char and converting to bool would be narrowing, even though
both are 8bit types).

This way we can get boolean fields using getField<bool>, and int fields
using getField<int> etc.

Change-Id: I2f1ba855ee01423e79ba999dfb9d86f4b98b1402
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/corelib/kernel/qjniobject.h               | 190 +++++++++---------
 .../kernel/qjniobject/tst_qjniobject.cpp      |  10 +
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/corelib/kernel/qjniobject.h b/src/corelib/kernel/qjniobject.h
index 05db6f4414..88214a9311 100644
--- a/src/corelib/kernel/qjniobject.h
+++ b/src/corelib/kernel/qjniobject.h
@@ -561,20 +561,10 @@ private:
     friend bool operator==(const QJniObject &, const QJniObject &);
     friend bool operator!=(const QJniObject&, const QJniObject&);
 
-    template<typename T, typename = void>
-    struct IntegerTypeDetail
-    {
-        using type = T;
-    };
-    template<typename T>
-    struct IntegerTypeDetail<T, typename std::enable_if_t<std::is_enum_v<T>>>
-    {
-        using type = std::underlying_type_t<T>;
-    };
-
-    template<typename Have, typename Want>
-    static constexpr bool likeIntegerType = std::is_same_v<Have, Want>
-                                         || std::is_same_v<typename IntegerTypeDetail<Have>::type, Want>;
+    template <typename Have, typename Want>
+    static constexpr bool sameTypeForJni = (QtJniTypes::Traits<Have>::signature()
+                                           == QtJniTypes::Traits<Want>::signature())
+                                       && (sizeof(Have) == sizeof(Want));
 
     template<typename T>
     static constexpr void callMethodForType(JNIEnv *env, T &res, jobject obj,
@@ -583,22 +573,22 @@ private:
         va_list args = {};
         va_start(args, id);
 
-        if constexpr (std::is_same_v<T, jboolean>)
-            res = env->CallBooleanMethodV(obj, id, args);
-        else if constexpr (likeIntegerType<T, jbyte>)
-            res = T{env->CallByteMethodV(obj, id, args)};
-        else if constexpr (likeIntegerType<T, jchar>)
-            res = T{env->CallCharMethodV(obj, id, args)};
-        else if constexpr (likeIntegerType<T, jshort>)
-            res = T{env->CallShortMethodV(obj, id, args)};
-        else if constexpr (likeIntegerType<T, jint>)
-            res = T{env->CallIntMethodV(obj, id, args)};
-        else if constexpr (likeIntegerType<T, jlong>)
-            res = T{env->CallLongMethodV(obj, id, args)};
-        else if constexpr (std::is_same_v<T, jfloat>)
-            res = env->CallFloatMethodV(obj, id, args);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            res = env->CallDoubleMethodV(obj, id, args);
+        if constexpr (sameTypeForJni<T, jboolean>)
+            res = T(env->CallBooleanMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jbyte>)
+            res = T(env->CallByteMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jchar>)
+            res = T(env->CallCharMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jshort>)
+            res = T(env->CallShortMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jint>)
+            res = T(env->CallIntMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jlong>)
+            res = T(env->CallLongMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            res = T(env->CallFloatMethodV(obj, id, args));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            res = T(env->CallDoubleMethodV(obj, id, args));
         else
             QtJniTypes::staticAssertTypeMismatch();
         va_end(args);
@@ -612,22 +602,22 @@ private:
             return;
         va_list args = {};
         va_start(args, id);
-        if constexpr (std::is_same_v<T, jboolean>)
-            res = env->CallStaticBooleanMethodV(clazz, id, args);
-        else if constexpr (likeIntegerType<T, jbyte>)
-            res = T{env->CallStaticByteMethodV(clazz, id, args)};
-        else if constexpr (likeIntegerType<T, jchar>)
-            res = T{env->CallStaticCharMethodV(clazz, id, args)};
-        else if constexpr (likeIntegerType<T, jshort>)
-            res = T{env->CallStaticShortMethodV(clazz, id, args)};
-        else if constexpr (likeIntegerType<T, jint>)
-            res = T{env->CallStaticIntMethodV(clazz, id, args)};
-        else if constexpr (likeIntegerType<T, jlong>)
-            res = T{env->CallStaticLongMethodV(clazz, id, args)};
-        else if constexpr (std::is_same_v<T, jfloat>)
-            res = env->CallStaticFloatMethodV(clazz, id, args);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            res = env->CallStaticDoubleMethodV(clazz, id, args);
+        if constexpr (sameTypeForJni<T, jboolean>)
+            res = T(env->CallStaticBooleanMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jbyte>)
+            res = T(env->CallStaticByteMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jchar>)
+            res = T(env->CallStaticCharMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jshort>)
+            res = T(env->CallStaticShortMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jint>)
+            res = T(env->CallStaticIntMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jlong>)
+            res = T(env->CallStaticLongMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            res = T(env->CallStaticFloatMethodV(clazz, id, args));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            res = T(env->CallStaticDoubleMethodV(clazz, id, args));
         else
             QtJniTypes::staticAssertTypeMismatch();
         va_end(args);
@@ -648,22 +638,22 @@ private:
     static constexpr void getFieldForType(JNIEnv *env, T &res, jobject obj,
                                           jfieldID id)
     {
-        if constexpr (std::is_same_v<T, jboolean>)
-            res = env->GetBooleanField(obj, id);
-        else if constexpr (likeIntegerType<T, jbyte>)
-            res = T{env->GetByteField(obj, id)};
-        else if constexpr (likeIntegerType<T, jchar>)
-            res = T{env->GetCharField(obj, id)};
-        else if constexpr (likeIntegerType<T, jshort>)
-            res = T{env->GetShortField(obj, id)};
-        else if constexpr (likeIntegerType<T, jint>)
-            res = T{env->GetIntField(obj, id)};
-        else if constexpr (likeIntegerType<T, jlong>)
-            res = T{env->GetLongField(obj, id)};
-        else if constexpr (std::is_same_v<T, jfloat>)
-            res = env->GetFloatField(obj, id);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            res = env->GetDoubleField(obj, id);
+        if constexpr (sameTypeForJni<T, jboolean>)
+            res = T(env->GetBooleanField(obj, id));
+        else if constexpr (sameTypeForJni<T, jbyte>)
+            res = T(env->GetByteField(obj, id));
+        else if constexpr (sameTypeForJni<T, jchar>)
+            res = T(env->GetCharField(obj, id));
+        else if constexpr (sameTypeForJni<T, jshort>)
+            res = T(env->GetShortField(obj, id));
+        else if constexpr (sameTypeForJni<T, jint>)
+            res = T(env->GetIntField(obj, id));
+        else if constexpr (sameTypeForJni<T, jlong>)
+            res = T(env->GetLongField(obj, id));
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            res = T(env->GetFloatField(obj, id));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            res = T(env->GetDoubleField(obj, id));
         else
             QtJniTypes::staticAssertTypeMismatch();
     }
@@ -672,22 +662,22 @@ private:
     static constexpr void getStaticFieldForType(JNIEnv *env, T &res, jclass clazz,
                                                 jfieldID id)
     {
-        if constexpr (std::is_same_v<T, jboolean>)
-            res = env->GetStaticBooleanField(clazz, id);
-        else if constexpr (likeIntegerType<T, jbyte>)
-            res = T{env->GetStaticByteField(clazz, id)};
-        else if constexpr (likeIntegerType<T, jchar>)
-            res = T{env->GetStaticCharField(clazz, id)};
-        else if constexpr (likeIntegerType<T, jshort>)
-            res = T{env->GetStaticShortField(clazz, id)};
-        else if constexpr (likeIntegerType<T, jint>)
-            res = T{env->GetStaticIntField(clazz, id)};
-        else if constexpr (likeIntegerType<T, jlong>)
-            res = T{env->GetStaticLongField(clazz, id)};
-        else if constexpr (std::is_same_v<T, jfloat>)
-            res = env->GetStaticFloatField(clazz, id);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            res = env->GetStaticDoubleField(clazz, id);
+        if constexpr (sameTypeForJni<T, jboolean>)
+            res = T(env->GetStaticBooleanField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jbyte>)
+            res = T(env->GetStaticByteField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jchar>)
+            res = T(env->GetStaticCharField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jshort>)
+            res = T(env->GetStaticShortField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jint>)
+            res = T(env->GetStaticIntField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jlong>)
+            res = T(env->GetStaticLongField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            res = T(env->GetStaticFloatField(clazz, id));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            res = T(env->GetStaticDoubleField(clazz, id));
         else
             QtJniTypes::staticAssertTypeMismatch();
     }
@@ -697,22 +687,22 @@ private:
                                           jfieldID id, T value)
     {
         LocalFrame<T> frame;
-        if constexpr (std::is_same_v<T, jboolean>)
-            env->SetBooleanField(obj, id, value);
-        else if constexpr (likeIntegerType<T, jbyte>)
+        if constexpr (sameTypeForJni<T, jboolean>)
+            env->SetBooleanField(obj, id, static_cast<jboolean>(value));
+        else if constexpr (sameTypeForJni<T, jbyte>)
             env->SetByteField(obj, id, static_cast<jbyte>(value));
-        else if constexpr (likeIntegerType<T, jchar>)
+        else if constexpr (sameTypeForJni<T, jchar>)
             env->SetCharField(obj, id, static_cast<jchar>(value));
-        else if constexpr (likeIntegerType<T, jshort>)
+        else if constexpr (sameTypeForJni<T, jshort>)
             env->SetShortField(obj, id, static_cast<jshort>(value));
-        else if constexpr (likeIntegerType<T, jint>)
+        else if constexpr (sameTypeForJni<T, jint>)
             env->SetIntField(obj, id, static_cast<jint>(value));
-        else if constexpr (likeIntegerType<T, jlong>)
+        else if constexpr (sameTypeForJni<T, jlong>)
             env->SetLongField(obj, id, static_cast<jlong>(value));
-        else if constexpr (std::is_same_v<T, jfloat>)
-            env->SetFloatField(obj, id, value);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            env->SetDoubleField(obj, id, value);
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            env->SetFloatField(obj, id, static_cast<jfloat>(value));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            env->SetDoubleField(obj, id, static_cast<jdouble>(value));
         else if constexpr (QtJniTypes::isObjectType<T>())
             env->SetObjectField(obj, id, static_cast<jobject>(frame.convertToJni(value)));
         else
@@ -724,22 +714,22 @@ private:
                                           jfieldID id, T value)
     {
         LocalFrame<T> frame;
-        if constexpr (std::is_same_v<T, jboolean>)
-            env->SetStaticBooleanField(clazz, id, value);
-        else if constexpr (likeIntegerType<T, jbyte>)
+        if constexpr (sameTypeForJni<T, jboolean>)
+            env->SetStaticBooleanField(clazz, id, static_cast<jboolean>(value));
+        else if constexpr (sameTypeForJni<T, jbyte>)
             env->SetStaticByteField(clazz, id, static_cast<jbyte>(value));
-        else if constexpr (likeIntegerType<T, jchar>)
+        else if constexpr (sameTypeForJni<T, jchar>)
             env->SetStaticCharField(clazz, id, static_cast<jchar>(value));
-        else if constexpr (likeIntegerType<T, jshort>)
+        else if constexpr (sameTypeForJni<T, jshort>)
             env->SetStaticShortField(clazz, id, static_cast<jshort>(value));
-        else if constexpr (likeIntegerType<T, jint>)
+        else if constexpr (sameTypeForJni<T, jint>)
             env->SetStaticIntField(clazz, id, static_cast<jint>(value));
-        else if constexpr (likeIntegerType<T, jlong>)
+        else if constexpr (sameTypeForJni<T, jlong>)
             env->SetStaticLongField(clazz, id, static_cast<jlong>(value));
-        else if constexpr (std::is_same_v<T, jfloat>)
-            env->SetStaticFloatField(clazz, id, value);
-        else if constexpr (std::is_same_v<T, jdouble>)
-            env->SetStaticDoubleField(clazz, id, value);
+        else if constexpr (sameTypeForJni<T, jfloat>)
+            env->SetStaticFloatField(clazz, id, static_cast<jfloat>(value));
+        else if constexpr (sameTypeForJni<T, jdouble>)
+            env->SetStaticDoubleField(clazz, id, static_cast<jdouble>(value));
         else if constexpr (QtJniTypes::isObjectType<T>())
             env->SetStaticObjectField(clazz, id, static_cast<jobject>(frame.convertToJni(value)));
         else
diff --git a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
index 751e5a84d8..364b0c5d62 100644
--- a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
+++ b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
@@ -77,6 +77,7 @@ private slots:
     void getStaticIntField();
     void getStaticByteFieldClassName();
     void getStaticByteField();
+    void getStaticBooleanField();
     void getStaticLongFieldClassName();
     void getStaticLongField();
     void getStaticDoubleFieldClassName();
@@ -936,6 +937,12 @@ void tst_QJniObject::getStaticByteField()
     QCOMPARE(e, Enum::MAX_VALUE);
 }
 
+void tst_QJniObject::getStaticBooleanField()
+{
+    QCOMPARE(TestClass::getStaticField<jboolean>("S_BOOLEAN_VAR"),
+             TestClass::getStaticField<bool>("S_BOOLEAN_VAR"));
+}
+
 void tst_QJniObject::getStaticLongFieldClassName()
 {
     jlong i = QJniObject::getStaticField<jlong>("java/lang/Long", "MAX_VALUE");
@@ -1038,6 +1045,7 @@ void tst_QJniObject::getBooleanField()
 
     QVERIFY(obj.isValid());
     QVERIFY(obj.getField<jboolean>("BOOL_FIELD"));
+    QVERIFY(obj.getField<bool>("BOOL_FIELD"));
 }
 
 void tst_QJniObject::getIntField()
@@ -1109,6 +1117,7 @@ void tst_QJniObject::setCharField()
 void tst_QJniObject::setBooleanField()
 {
     setField("BOOLEAN_VAR", jboolean(true));
+    setField("BOOLEAN_VAR", true);
 }
 
 void tst_QJniObject::setObjectField()
@@ -1191,6 +1200,7 @@ void tst_QJniObject::setStaticCharField()
 void tst_QJniObject::setStaticBooleanField()
 {
     setStaticField("S_BOOLEAN_VAR", jboolean(true));
+    setStaticField("S_BOOLEAN_VAR", true);
 }
 
 void tst_QJniObject::setStaticObjectField()