Check enhanced for loop expression for nil.

Change on 2013/10/29 by tball <tball@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=55788639
tempbottle · Nov 1, 2013 · 43a3bf4 · 43a3bf4
1 parent 3962d51
commit 43a3bf4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/translator/src/main/java/com/google/devtools/j2objc/translate/NilCheckResolver.java b/translator/src/main/java/com/google/devtools/j2objc/translate/NilCheckResolver.java
@@ -384,6 +384,7 @@ public boolean visit(DoStatement node) {
 
   @Override
   public boolean visit(EnhancedForStatement node) {
+    addNilCheck(node.getExpression(), false);
     node.getExpression().accept(this);
     pushScope();
     node.getBody().accept(this);

diff --git a/translator/src/test/java/com/google/devtools/j2objc/translate/NilCheckResolverTest.java b/translator/src/test/java/com/google/devtools/j2objc/translate/NilCheckResolverTest.java
@@ -123,4 +123,17 @@ public void testNilCheckAfterConditionalInfix() throws IOException {
         "BOOL b2 = b || [((Test *) nil_chk(t2)) foo];",
         "[((Test *) nil_chk(t2)) foo];");
   }
+
+  public void testNilCheckEnhancedForExpression() throws IOException {
+    String translation = translateSourceFile(
+        "public class Test {" +
+        "  boolean test(String target, java.util.List<String> strings) {" +
+        "    for (String s : strings) {" +
+        "      if (s.equals(target)) return true;" +
+        "    }" +
+        "    return false;" +
+        "  }}",
+        "Test", "Test.m");
+    assertTranslation(translation, "nil_chk(strings)");
+  }
 }