Skip to content

Commit

Permalink
Version 3.3.0-188.0.dev
Browse files Browse the repository at this point in the history
Merge fc4b352 into dev
  • Loading branch information
Dart CI committed Dec 4, 2023
2 parents 0f7c94b + fc4b352 commit 67f7a2c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ vars = {

# co19 is a cipd package automatically generated for each co19 commit.
# Use tests/co19/update.sh to update this hash.
"co19_rev": "85c868a325bc92f4e743958077ad0ad2eb58c81f",
"co19_rev": "2ba55b45d85fece505a503dd12cf1c708825b74f",

# The internal benchmarks to use. See go/dart-benchmarks-internal
"benchmarks_internal_rev": "f048a4a853e3062056d39c3db100acdde42f16d6",
Expand Down
5 changes: 3 additions & 2 deletions pkg/compiler/lib/src/dart2js.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import 'package:front_end/src/api_unstable/dart2js.dart' as fe;
import '../compiler_api.dart' as api;
import 'commandline_options.dart';
import 'common/ram_usage.dart';
import 'compiler.dart' as defaultCompiler show Compiler;
import 'io/mapped_file.dart';
import 'options.dart' show CompilerOptions, Dart2JSStage, FeatureOptions;
import 'compiler.dart' as defaultCompiler show Compiler;
import 'source_file_provider.dart';
import 'util/command_line.dart';
import 'util/util.dart' show stackTraceFilePrefix;
Expand Down Expand Up @@ -982,7 +982,8 @@ Usage: dart compile js [arguments] <dart entry point>
-O2 Safe production-oriented optimizations (like minification).
-O3 Potentially unsafe optimizations (see -h -v for details).
-O4 More agressive unsafe optimizations (see -h -v for details).
''');
'''
.trim());
}

void verboseHelp() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/dart2wasm/lib/translator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ class Translator with KernelNodes {
}
if (type is TypeParameterType) {
return translateStorageType(nullable
? type.bound.withDeclaredNullability(type.nullability)
? type.bound.withDeclaredNullability(Nullability.nullable)
: type.bound);
}
if (type is IntersectionType) {
Expand Down
8 changes: 6 additions & 2 deletions sdk/lib/_internal/wasm/lib/list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ abstract class _ListBase<E> extends ListBase<E> {
_ListBase._withData(this._length, this._data);

E operator [](int index) {
IndexError.check(index, _length, indexable: this, name: "[]");
if (WasmI64.fromInt(_length).leU(WasmI64.fromInt(index))) {
throw IndexError.withLength(index, length, name: "[]");
}
return unsafeCast(_data.read(index));
}

Expand Down Expand Up @@ -58,7 +60,9 @@ abstract class _ModifiableList<E> extends _ListBase<E> {
: super._withData(length, data);

void operator []=(int index, E value) {
IndexError.check(index, _length, indexable: this, name: "[]=");
if (WasmI64.fromInt(_length).leU(WasmI64.fromInt(index))) {
throw IndexError.withLength(index, length, name: "[]=");
}
_data.write(index, value);
}

Expand Down
17 changes: 17 additions & 0 deletions tests/language/extension_type/regress_53968_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright (c) 2023, 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.

// SharedOptions=--enable-experiment=inline-class

// Regression check for https://dartbug.com/53968

extension type A(int a) {}

T returnA<T extends A?>() {
return null as T;
}

void main() {
returnA();
}
2 changes: 1 addition & 1 deletion tools/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ CHANNEL dev
MAJOR 3
MINOR 3
PATCH 0
PRERELEASE 187
PRERELEASE 188
PRERELEASE_PATCH 0

0 comments on commit 67f7a2c

Please sign in to comment.