Version 2.17.0-46.0.dev
Merge commit 'b378da0c8b1d32c0b056c90f9cdc34ffea23b433' into 'dev'
diff --git a/pkg/analyzer/lib/src/error/type_arguments_verifier.dart b/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
index 9db6af2..1488253 100644
--- a/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
+++ b/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
@@ -13,12 +13,10 @@
import 'package:analyzer/error/listener.dart';
import 'package:analyzer/src/dart/ast/extensions.dart';
import 'package:analyzer/src/dart/element/type_algebra.dart';
-import 'package:analyzer/src/dart/element/type_schema.dart';
import 'package:analyzer/src/dart/element/type_system.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart';
import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
-import 'package:analyzer/src/generated/resolver.dart';
class TypeArgumentsVerifier {
final AnalysisOptionsImpl _options;
@@ -252,7 +250,7 @@
return;
}
var type = node.typeOrThrow;
- if (_isMissingTypeArguments(node, type, node.name.staticElement, null)) {
+ if (_isMissingTypeArguments(node, type, node.name.staticElement)) {
AstNode unwrappedParent = parentEscapingTypeArguments(node);
if (unwrappedParent is AsExpression || unwrappedParent is IsExpression) {
// Do not report a "Strict raw type" error in this case; too noisy.
@@ -539,8 +537,7 @@
/// contain `_`
/// - [type] does not have any `dynamic` type arguments.
/// - the element is marked with `@optionalTypeArgs` from "package:meta".
- bool _isMissingTypeArguments(AstNode node, DartType type, Element? element,
- Expression? inferenceContextNode) {
+ bool _isMissingTypeArguments(AstNode node, DartType type, Element? element) {
List<DartType> typeArguments;
var alias = type.alias;
if (alias != null) {
@@ -554,16 +551,6 @@
// Check if this type has type arguments and at least one is dynamic.
// If so, we may need to issue a strict-raw-types error.
if (typeArguments.any((t) => t.isDynamic)) {
- // If we have an inference context node, check if the type was inferred
- // from it. Some cases will not have a context type, such as the type
- // annotation `List` in `List list;`
- if (inferenceContextNode != null) {
- var contextType = InferenceContext.getContext(inferenceContextNode);
- if (contextType != null && UnknownInferredType.isKnown(contextType)) {
- // Type was inferred from downwards context: not an error.
- return false;
- }
- }
if (element != null && element.hasOptionalTypeArgs) {
return false;
}
diff --git a/runtime/vm/compiler/assembler/assembler_riscv.cc b/runtime/vm/compiler/assembler/assembler_riscv.cc
index b86d5c7..1c67022 100644
--- a/runtime/vm/compiler/assembler/assembler_riscv.cc
+++ b/runtime/vm/compiler/assembler/assembler_riscv.cc
@@ -3899,7 +3899,7 @@
NOT_IN_PRODUCT(MaybeTraceAllocation(cid, temp1, failure));
// Potential new object start.
lx(instance, Address(THR, target::Thread::top_offset()));
- addi(end_address, instance, instance_size);
+ AddImmediate(end_address, instance, instance_size);
bltu(end_address, instance, failure); // Fail on unsigned overflow.
// Check if the allocation fits into the remaining space.
diff --git a/tools/VERSION b/tools/VERSION
index d40a15f..6c2bb80 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 17
PATCH 0
-PRERELEASE 45
+PRERELEASE 46
PRERELEASE_PATCH 0
\ No newline at end of file
