From 6c688448218cca67f72a1b5327f1823c6bcb8e27 Mon Sep 17 00:00:00 2001 From: Joshua Litt Date: Tue, 18 Feb 2020 23:02:49 +0000 Subject: [PATCH] [dart2js] Two small fixes for building dart2js with the nnbd runtime. Fix for NoSuchmethod's signature. Fix for NeverType's scope visitor. Change-Id: I7d98e37eb7bfcb67339b36d1b335fc4ba9eff6d1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136320 Reviewed-by: Sigmund Cherem Commit-Queue: Joshua Litt --- pkg/compiler/lib/src/ir/scope_visitor.dart | 4 ++++ sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/compiler/lib/src/ir/scope_visitor.dart b/pkg/compiler/lib/src/ir/scope_visitor.dart index a90d0a1bd03..3be27586ae3 100644 --- a/pkg/compiler/lib/src/ir/scope_visitor.dart +++ b/pkg/compiler/lib/src/ir/scope_visitor.dart @@ -617,6 +617,10 @@ class ScopeModelBuilder extends ir.Visitor InitializerComplexity visitBottomType(ir.BottomType node) => const InitializerComplexity.lazy(); + @override + InitializerComplexity visitNeverType(ir.NeverType node) => + const InitializerComplexity.lazy(); + @override InitializerComplexity visitInvalidType(ir.InvalidType node) => const InitializerComplexity.lazy(); diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart index dd093d2edad..83302ecace5 100644 --- a/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart +++ b/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart @@ -3161,8 +3161,8 @@ void assertHelper(condition) { /// resolved cannot be found. void throwNoSuchMethod(obj, name, arguments, expectedArgumentNames) { Symbol memberName = new _symbol_dev.Symbol.unvalidated(name); - throw new NoSuchMethodError(obj, memberName, arguments, - new Map(), expectedArgumentNames); + throw new NoSuchMethodError( + obj, memberName, arguments, new Map()); } /// Called by generated code when a static field's initializer references the