Combine isFunctionCallThatAlwaysThrows with ClosureCodingConvention

R=fukino@chromium.org BUG=none TEST=compiler_tests.py Review URL: https://codereview.chromium.org/1416333003 . Cr-Commit-Position: refs/heads/master@{#355924}
marcosholgado · Oct 23, 2015 · 0680a86 · 0680a86
1 parent 6fb48a9
commit 0680a86
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/third_party/closure_compiler/compiler/compiler.jar b/third_party/closure_compiler/compiler/compiler.jar
diff --git a/third_party/closure_compiler/runner/runner.jar b/third_party/closure_compiler/runner/runner.jar
diff --git a/...rty/closure_compiler/runner/src/org/chromium/closure/compiler/ChromeCodingConvention.java b/...rty/closure_compiler/runner/src/org/chromium/closure/compiler/ChromeCodingConvention.java
@@ -68,20 +68,9 @@ public Collection<AssertionFunctionSpec> getAssertionFunctions() {
     );
   }
 
-  // TODO(dbeam): combine this with ClosureCodingConvention?
   @Override
   public boolean isFunctionCallThatAlwaysThrows(Node n) {
-    if (n.isExprResult()) {
-      if (!n.getFirstChild().isCall()) {
-        return false;
-      }
-    } else if (!n.isCall()) {
-      return false;
-    }
-    if (n.isExprResult()) {
-      n = n.getFirstChild();
-    }
-    // n is a call
-    return n.getFirstChild().matchesQualifiedName("assertNotReached");
+    return CodingConventions.defaultIsFunctionCallThatAlwaysThrows(
+        n, "assertNotReached");
   }
 }