Version 2.12.0-195.0.dev
Merge commit '061d71497144bcbda64b13666b5e8e62cde84ae4' into 'dev'
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart b/pkg/front_end/testcases/nnbd/issue40945.dart
new file mode 100644
index 0000000..060aa8c
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart
@@ -0,0 +1,16 @@
+// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+class C {
+ void set test(int v) {}
+ dynamic get test => 3.14;
+}
+
+test() {
+ C c = new C();
+ c.test = 1;
+ c.test;
+}
+
+main() {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.outline.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.outline.expect
new file mode 100644
index 0000000..3cf2669
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.outline.expect
@@ -0,0 +1,26 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue40945.dart:7:15: Error: The type 'dynamic' of the getter 'C.test' is not a subtype of the type 'int' of the setter 'C.test'.
+// dynamic get test => 3.14;
+// ^^^^
+// pkg/front_end/testcases/nnbd/issue40945.dart:6:12: Context: This is the declaration of the setter 'C.test'.
+// void set test(int v) {}
+// ^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ synthetic constructor •() → self::C
+ ;
+ set test(core::int v) → void
+ ;
+ get test() → dynamic
+ ;
+}
+static method test() → dynamic
+ ;
+static method main() → dynamic
+ ;
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.strong.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.strong.expect
new file mode 100644
index 0000000..b38f082d
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.strong.expect
@@ -0,0 +1,28 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue40945.dart:7:15: Error: The type 'dynamic' of the getter 'C.test' is not a subtype of the type 'int' of the setter 'C.test'.
+// dynamic get test => 3.14;
+// ^^^^
+// pkg/front_end/testcases/nnbd/issue40945.dart:6:12: Context: This is the declaration of the setter 'C.test'.
+// void set test(int v) {}
+// ^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ synthetic constructor •() → self::C
+ : super core::Object::•()
+ ;
+ set test(core::int v) → void {}
+ get test() → dynamic
+ return 3.14;
+}
+static method test() → dynamic {
+ self::C c = new self::C::•();
+ c.{self::C::test} = 1;
+ c.{self::C::test};
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.strong.transformed.expect
new file mode 100644
index 0000000..b38f082d
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.strong.transformed.expect
@@ -0,0 +1,28 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue40945.dart:7:15: Error: The type 'dynamic' of the getter 'C.test' is not a subtype of the type 'int' of the setter 'C.test'.
+// dynamic get test => 3.14;
+// ^^^^
+// pkg/front_end/testcases/nnbd/issue40945.dart:6:12: Context: This is the declaration of the setter 'C.test'.
+// void set test(int v) {}
+// ^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ synthetic constructor •() → self::C
+ : super core::Object::•()
+ ;
+ set test(core::int v) → void {}
+ get test() → dynamic
+ return 3.14;
+}
+static method test() → dynamic {
+ self::C c = new self::C::•();
+ c.{self::C::test} = 1;
+ c.{self::C::test};
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline.expect
new file mode 100644
index 0000000..1da15dd
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline.expect
@@ -0,0 +1,7 @@
+class C {
+ void set test(int v) {}
+ dynamic get test => 3.14;
+}
+
+test() {}
+main() {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline_modelled.expect
new file mode 100644
index 0000000..f5a215c
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.textual_outline_modelled.expect
@@ -0,0 +1,7 @@
+class C {
+ dynamic get test => 3.14;
+ void set test(int v) {}
+}
+
+main() {}
+test() {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.weak.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.weak.expect
new file mode 100644
index 0000000..b38f082d
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.weak.expect
@@ -0,0 +1,28 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue40945.dart:7:15: Error: The type 'dynamic' of the getter 'C.test' is not a subtype of the type 'int' of the setter 'C.test'.
+// dynamic get test => 3.14;
+// ^^^^
+// pkg/front_end/testcases/nnbd/issue40945.dart:6:12: Context: This is the declaration of the setter 'C.test'.
+// void set test(int v) {}
+// ^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ synthetic constructor •() → self::C
+ : super core::Object::•()
+ ;
+ set test(core::int v) → void {}
+ get test() → dynamic
+ return 3.14;
+}
+static method test() → dynamic {
+ self::C c = new self::C::•();
+ c.{self::C::test} = 1;
+ c.{self::C::test};
+}
+static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/nnbd/issue40945.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/issue40945.dart.weak.transformed.expect
new file mode 100644
index 0000000..b38f082d
--- /dev/null
+++ b/pkg/front_end/testcases/nnbd/issue40945.dart.weak.transformed.expect
@@ -0,0 +1,28 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/nnbd/issue40945.dart:7:15: Error: The type 'dynamic' of the getter 'C.test' is not a subtype of the type 'int' of the setter 'C.test'.
+// dynamic get test => 3.14;
+// ^^^^
+// pkg/front_end/testcases/nnbd/issue40945.dart:6:12: Context: This is the declaration of the setter 'C.test'.
+// void set test(int v) {}
+// ^^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class C extends core::Object {
+ synthetic constructor •() → self::C
+ : super core::Object::•()
+ ;
+ set test(core::int v) → void {}
+ get test() → dynamic
+ return 3.14;
+}
+static method test() → dynamic {
+ self::C c = new self::C::•();
+ c.{self::C::test} = 1;
+ c.{self::C::test};
+}
+static method main() → dynamic {}
diff --git a/tools/VERSION b/tools/VERSION
index 771533f..1c971c8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 12
PATCH 0
-PRERELEASE 194
+PRERELEASE 195
PRERELEASE_PATCH 0
\ No newline at end of file
