From 06c662a16872163d6229508310b9b00b93279dc1 Mon Sep 17 00:00:00 2001 From: J2ObjC Team Date: Thu, 4 Jan 2024 11:02:21 -0800 Subject: [PATCH] Prevent j2objc protos from receiving generics when used as arguments. PiperOrigin-RevId: 595751862 --- .../src/main/java/com/google/devtools/j2objc/util/NameTable.java | 1 + 1 file changed, 1 insertion(+) diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java b/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java index 21815c0361..7539802964 100644 --- a/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java +++ b/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java @@ -720,6 +720,7 @@ && isTranslatableTypeVariable((TypeVariable) type, genericUsageTypeElement)) { && enableGenerics && !((DeclaredType) type).getTypeArguments().isEmpty() && !TypeUtil.isInterface(type) + && !typeUtil.isProtoClass(type) && !typeUtil.isClassType(TypeUtil.asTypeElement(type))) { final String finalQualifiers = qualifiers; // Avoid creating generics that merely state . Obj-C generics only support 'id'