Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java

Issue 10825185: Issue 4354. Fix for NPE when switch/case has no expression (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
diff --git a/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java b/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
index 1c11c7ea8425c67921bcd53386f6551b6299b1da..70d4b7d802a5d912c7a4f44a9662fde62351f926 100644
--- a/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
+++ b/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
@@ -2129,6 +2129,10 @@ public class TypeAnalyzer implements DartCompilationPhase {
if (switchMember instanceof DartCase) {
DartCase caseMember = (DartCase) switchMember;
DartExpression caseExpr = caseMember.getExpr();
+ // no expression, parser already reported about this
+ if (caseExpr == null) {
+ continue;
+ }
Type caseType = nonVoidTypeOf(caseExpr);
// should be "int" or "String"
if (!Objects.equal(caseType, intType) && !Objects.equal(caseType, stringType)) {
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698