Version 2.14.0-16.0.dev
Merge commit '8156646b0c92f0e1d83ef62a84745c37c4cd1d72' into 'dev'
diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
index 96450ad..4304a9d 100644
--- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -555,7 +555,7 @@
@override
void handleMixinOn(Token onKeyword, int typeCount) {
debugEvent("handleMixinOn");
- push(const FixedNullableList<NamedTypeBuilder>().pop(stack, typeCount) ??
+ push(const FixedNullableList<TypeBuilder>().pop(stack, typeCount) ??
new ParserRecovery(offsetForToken(onKeyword)));
}
diff --git a/pkg/front_end/testcases/general/issue45700.dart b/pkg/front_end/testcases/general/issue45700.dart
new file mode 100644
index 0000000..b8d3158
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue45700.dart
@@ -0,0 +1,7 @@
+// Copyright (c) 2019, 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.
+
+mixin M on Function() {}
+
+void main() {}
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general/issue45700.dart.textual_outline.expect b/pkg/front_end/testcases/general/issue45700.dart.textual_outline.expect
new file mode 100644
index 0000000..b077b26
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue45700.dart.textual_outline.expect
@@ -0,0 +1,2 @@
+mixin M on Function() {}
+void main() {}
diff --git a/pkg/front_end/testcases/general/issue45700.dart.weak.expect b/pkg/front_end/testcases/general/issue45700.dart.weak.expect
new file mode 100644
index 0000000..e33f323
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue45700.dart.weak.expect
@@ -0,0 +1,14 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue45700.dart:5:7: Error: Can't use a function type as supertype.
+// mixin M on Function() {}
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class M extends core::Object /*isMixinDeclaration*/ {
+}
+static method main() → void {}
diff --git a/pkg/front_end/testcases/general/issue45700.dart.weak.outline.expect b/pkg/front_end/testcases/general/issue45700.dart.weak.outline.expect
new file mode 100644
index 0000000..bca7ff6
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue45700.dart.weak.outline.expect
@@ -0,0 +1,15 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue45700.dart:5:7: Error: Can't use a function type as supertype.
+// mixin M on Function() {}
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class M extends core::Object /*isMixinDeclaration*/ {
+}
+static method main() → void
+ ;
diff --git a/pkg/front_end/testcases/general/issue45700.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue45700.dart.weak.transformed.expect
new file mode 100644
index 0000000..e33f323
--- /dev/null
+++ b/pkg/front_end/testcases/general/issue45700.dart.weak.transformed.expect
@@ -0,0 +1,14 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/general/issue45700.dart:5:7: Error: Can't use a function type as supertype.
+// mixin M on Function() {}
+// ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class M extends core::Object /*isMixinDeclaration*/ {
+}
+static method main() → void {}
diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status
index 12e2725..ef59299 100644
--- a/pkg/front_end/testcases/textual_outline.status
+++ b/pkg/front_end/testcases/textual_outline.status
@@ -65,6 +65,7 @@
general/issue42997: FormatterCrash
general/issue43363: FormatterCrash
general/issue45490: FormatterCrash
+general/issue45700: FormatterCrash
general/many_errors: FormatterCrash
general/null_safety_invalid_experiment: FormatterCrash
general/null_safety_invalid_experiment_and_language_version: FormatterCrash
diff --git a/runtime/vm/instructions_x64.h b/runtime/vm/instructions_x64.h
index ce23054..a65ba55 100644
--- a/runtime/vm/instructions_x64.h
+++ b/runtime/vm/instructions_x64.h
@@ -187,8 +187,8 @@
class PcRelativeTailCallPattern : public PcRelativeTrampolineJumpPattern {
public:
- static constexpr intptr_t kLowerCallingRange = -(1ul << 31) + kLengthInBytes;
- static constexpr intptr_t kUpperCallingRange = (1ul << 31) - 1;
+ static constexpr intptr_t kLowerCallingRange = -(DART_INT64_C(1) << 31) + kLengthInBytes;
+ static constexpr intptr_t kUpperCallingRange = (DART_INT64_C(1) << 31) - 1;
explicit PcRelativeTailCallPattern(uword pc)
: PcRelativeTrampolineJumpPattern(pc) {}
diff --git a/tools/VERSION b/tools/VERSION
index b42b43f..c1ed934 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 15
+PRERELEASE 16
PRERELEASE_PATCH 0
\ No newline at end of file
