aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcushon <cushon@google.com>2017-03-10 12:36:34 -0800
committerLiam Miller-Cushon <cushon@google.com>2017-03-18 00:23:31 -0700
commite186fd9f6b51ccb177d1e250507c5452abe1eb9c (patch)
tree14a36e9d9c0980b761eb40c7786b56eb1ab8d2cb
parent47b6b617f273c2a2afb1383c9bf9169a17fb5295 (diff)
downloadturbine-e186fd9f6b51ccb177d1e250507c5452abe1eb9c.tar.gz
Handle another symbol resolution error
MOE_MIGRATED_REVID=149786437
-rw-r--r--java/com/google/turbine/binder/TypeBinder.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/com/google/turbine/binder/TypeBinder.java b/java/com/google/turbine/binder/TypeBinder.java
index 0ebd33c..4176b59 100644
--- a/java/com/google/turbine/binder/TypeBinder.java
+++ b/java/com/google/turbine/binder/TypeBinder.java
@@ -16,7 +16,6 @@
package com.google.turbine.binder;
-import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.turbine.binder.bound.HeaderBoundClass;
@@ -631,10 +630,9 @@ public class TypeBinder {
}
// resolve the prefix to a symbol
LookupResult result = scope.lookup(new LookupKey(names));
- if (result == null) {
+ if (result == null || result.sym() == null) {
throw error(t.position(), ErrorKind.SYMBOL_NOT_FOUND, t);
}
- Verify.verifyNotNull(result, "%s", names);
Symbol sym = result.sym();
int annoIdx = flat.size() - result.remaining().size() - 1;
ImmutableList<AnnoInfo> annos = bindAnnotations(scope, flat.get(annoIdx).annos());