Skip to content

Commit 3cc0c7b

Browse files
micapolos-googlecopybara-github
authored andcommitted
Update EnumRewriter to use correct nullability when null-marked:
- removes unreachable `return nil` after `@throw` in `valueOf` method, - generate `_Nullable` annotation in null-marked mode in declaration of `fromOrdinal` method. PiperOrigin-RevId: 733537386
1 parent 200b6e0 commit 3cc0c7b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

translator/src/main/java/com/google/devtools/j2objc/translate/EnumRewriter.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,7 @@ private void addValueOfMethod(EnumDeclaration node) {
317317
+ " }\n"
318318
+ " }\n", numConstants, typeName, typeName));
319319
}
320-
impl.append(
321-
" @throw create_JavaLangIllegalArgumentException_initWithNSString_(name);\n"
322-
+ " return nil;");
320+
impl.append(" @throw create_JavaLangIllegalArgumentException_initWithNSString_(name);");
323321
}
324322

325323
body.addStatement(new NativeStatement(impl.toString()));
@@ -391,8 +389,8 @@ private void addExtraNativeDecls(EnumDeclaration node) {
391389

392390
outerHeader.append(
393391
UnicodeUtils.format(
394-
"FOUNDATION_EXPORT %s *%s_fromOrdinal(%s ordinal);\n",
395-
typeName, typeName, ordinalArgType));
392+
"FOUNDATION_EXPORT %s *%s%s_fromOrdinal(%s ordinal);\n",
393+
typeName, options.nullMarked() ? "_Nullable " : "", typeName, ordinalArgType));
396394
outerImpl.append(
397395
UnicodeUtils.format(
398396
"%s *%s_fromOrdinal(%s ordinal) {\n", typeName, typeName, ordinalArgType));

0 commit comments

Comments
 (0)