Fix nullderef when ConstantReference::Resolve fails
This is a regression due to aosp/1538630.
Bug: 176888762
Test: aidl_unittests
Change-Id: I3e608f128ecc3bf5b58db4e90069c70293536e5b
diff --git a/parser.cpp b/parser.cpp
index 083e75c..721979f 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -74,14 +74,14 @@
if (v.GetRefType() && !v.GetRefType()->IsResolved()) {
if (!resolver_(typenames_.GetDocumentFor(scope_), v.GetRefType().get())) {
- AIDL_ERROR(v.GetRefType()) << "Failed to resolve '" << v.GetRefType()->GetName() << "'";
+ AIDL_ERROR(v.GetRefType()) << "Unknown type '" << v.GetRefType()->GetName() << "'";
*success_ = false;
return;
}
}
const AidlConstantValue* resolved = v.Resolve(scope_);
if (!resolved) {
- AIDL_ERROR(v.GetRefType()) << "Failed to resolve '" << v.GetRefType()->GetName() << "'";
+ AIDL_ERROR(v) << "Unknown reference '" << v.Literal() << "'";
*success_ = false;
return;
}