[vm/kernel] Handle InvalidExpression in constant contexts

mraleph · commit-bot@chromium.org · commit f521f38b5728 · 2019-07-11T16:59:48.000Z
It might occur there when CFE starts performing constant evaluation. Change-Id: I635b8f855f0128a4c1decb1417e310ab91b276ce Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108780 Auto-Submit: Vyacheslav Egorov <vegorov@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Vyacheslav Egorov <vegorov@google.com>
diff --git a/runtime/vm/compiler/frontend/constant_evaluator.cc b/runtime/vm/compiler/frontend/constant_evaluator.cc
@@ -175,6 +175,15 @@ RawInstance* ConstantEvaluator::EvaluateExpression(intptr_t offset,
       case kDeprecated_ConstantExpression:
         result_ = EvaluateConstantExpression(helper_->ReadUInt());
         break;
+      case kInvalidExpression: {
+        helper_->ReadPosition();  // Skip position.
+        const String& message = H.DartString(helper_->ReadStringReference());
+        // Invalid expression message has pointer to the source code, no need to
+        // report it twice.
+        H.ReportError(helper_->script(), TokenPosition::kNoSource, "%s",
+                      message.ToCString());
+        break;
+      }
       default:
         H.ReportError(
             script_, TokenPosition::kNoSource,
