Skip to content

deps: add deprecation warning for import assertion syntax #51631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

deps: add deprecation warning for import assertion syntax #51631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26592ec
deps: V8: cherry-pick ae5a4db8ad86
aduh95 Feb 1, 2024
545a983
deps: V8: cherry-pick 26fd1dfa9cd6
aduh95 Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.13',
'v8_embedder_string': '-node.15',

##### V8 defaults for Node.js #####

Expand Down
3 changes: 3 additions & 0 deletions deps/v8/src/common/message-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ namespace internal {
T(IllegalInvocation, "Illegal invocation") \
T(ImmutablePrototypeSet, \
"Immutable prototype object '%' cannot have their prototype set") \
T(ImportAssertDeprecated, \
"'assert' is deprecated in import statements and support will be removed " \
"in %; use 'with' instead") \
T(ImportAssertionDuplicateKey, "Import assertion has duplicate key '%'") \
T(ImportCallNotNewExpression, "Cannot use new with import") \
T(ImportOutsideModule, "Cannot use import statement outside a module") \
Expand Down
14 changes: 14 additions & 0 deletions deps/v8/src/execution/isolate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5469,6 +5469,20 @@ MaybeHandle<FixedArray> Isolate::GetImportAssertionsFromArgument(
// an error.
return MaybeHandle<FixedArray>();
}

if (V8_UNLIKELY(!IsUndefined(*import_assertions_object))) {
MessageLocation* location = nullptr;
MessageLocation computed_location;
if (ComputeLocation(&computed_location)) {
location = &computed_location;
}
Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
this, MessageTemplate::kImportAssertDeprecated, location,
factory()->NewStringFromAsciiChecked("12.6"),
Handle<FixedArray>::null());
message->set_error_level(v8::Isolate::kMessageWarning);
MessageHandler::ReportMessage(this, location, message);
}
}

// If there is no 'with' or 'assert' option in the options bag, it's not an
Expand Down
3 changes: 3 additions & 0 deletions deps/v8/src/parsing/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,9 @@ ImportAssertions* Parser::ParseImportAssertClause() {
//
// TODO(v8:13856): Remove once decision is made to unship 'assert' or keep.
++use_counts_[v8::Isolate::kImportAssertionDeprecatedSyntax];
info_->pending_error_handler()->ReportWarningAt(
position(), end_position(), MessageTemplate::kImportAssertDeprecated,
"12.6");
} else {
return import_assertions;
}
Expand Down
3 changes: 2 additions & 1 deletion deps/v8/test/message/fail/modules-import-assertions-fail-2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*%(basename)s:9: 'assert' is deprecated in import statements and support will be removed in 12.6; use 'with' instead
undefined:1: SyntaxError: Unexpected token '/', "// Copyrig"... is not valid JSON
// Copyright 2021 the V8 project authors. All rights reserved.
^
SyntaxError: Unexpected token '/', "// Copyrig"... is not valid JSON
SyntaxError: Unexpected token '/', "// Copyrig"... is not valid JSON
8 changes: 4 additions & 4 deletions deps/v8/test/unittests/interpreter/bytecode_expectations/PrivateAccessorAccess.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ bytecodes: [
/* 48 E> */ B(DefineKeyedOwnProperty), R(this), R(0), U8(0), U8(0),
/* 53 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
/* 58 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(316),
B(Wide), B(LdaSmi), I16(317),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down Expand Up @@ -115,7 +115,7 @@ bytecodes: [
/* 41 E> */ B(DefineKeyedOwnProperty), R(this), R(0), U8(0), U8(0),
/* 46 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
/* 51 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(315),
B(Wide), B(LdaSmi), I16(316),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down Expand Up @@ -149,7 +149,7 @@ bytecodes: [
B(Star2),
B(LdaImmutableCurrentContextSlot), U8(3),
/* 58 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(316),
B(Wide), B(LdaSmi), I16(317),
B(Star3),
B(LdaConstant), U8(0),
B(Star4),
Expand Down Expand Up @@ -181,7 +181,7 @@ bytecodes: [
/* 41 E> */ B(DefineKeyedOwnProperty), R(this), R(0), U8(0), U8(0),
/* 46 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
/* 51 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(315),
B(Wide), B(LdaSmi), I16(316),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down
4 changes: 2 additions & 2 deletions deps/v8/test/unittests/interpreter/bytecode_expectations/PrivateMethodAccess.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bytecodes: [
B(Star2),
B(LdaImmutableCurrentContextSlot), U8(3),
/* 54 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(314),
B(Wide), B(LdaSmi), I16(315),
B(Star3),
B(LdaConstant), U8(0),
B(Star4),
Expand Down Expand Up @@ -91,7 +91,7 @@ bytecodes: [
/* 44 E> */ B(DefineKeyedOwnProperty), R(this), R(0), U8(0), U8(0),
/* 49 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
/* 54 E> */ B(GetKeyedProperty), R(this), U8(2),
B(Wide), B(LdaSmi), I16(314),
B(Wide), B(LdaSmi), I16(315),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down
30 changes: 15 additions & 15 deletions deps/v8/test/unittests/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(1),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down Expand Up @@ -61,13 +61,13 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
/* 61 E> */ B(CallRuntime), U16(Runtime::kNewTypeError), R(2), U8(2),
B(Throw),
B(Wide), B(LdaSmi), I16(314),
B(Wide), B(LdaSmi), I16(315),
B(Star2),
B(LdaConstant), U8(1),
B(Star3),
Expand Down Expand Up @@ -99,13 +99,13 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star1),
B(LdaConstant), U8(0),
B(Star2),
/* 61 E> */ B(CallRuntime), U16(Runtime::kNewTypeError), R(1), U8(2),
B(Throw),
B(Wide), B(LdaSmi), I16(314),
B(Wide), B(LdaSmi), I16(315),
B(Star1),
B(LdaConstant), U8(1),
B(Star2),
Expand Down Expand Up @@ -145,7 +145,7 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand All @@ -167,7 +167,7 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star3),
B(LdaConstant), U8(0),
B(Star4),
Expand All @@ -182,7 +182,7 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
Expand Down Expand Up @@ -216,13 +216,13 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star1),
B(LdaConstant), U8(0),
B(Star2),
/* 65 E> */ B(CallRuntime), U16(Runtime::kNewTypeError), R(1), U8(2),
B(Throw),
B(Wide), B(LdaSmi), I16(316),
B(Wide), B(LdaSmi), I16(317),
B(Star1),
B(LdaConstant), U8(1),
B(Star2),
Expand Down Expand Up @@ -253,13 +253,13 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star1),
B(LdaConstant), U8(0),
B(Star2),
/* 58 E> */ B(CallRuntime), U16(Runtime::kNewTypeError), R(1), U8(2),
B(Throw),
B(Wide), B(LdaSmi), I16(315),
B(Wide), B(LdaSmi), I16(316),
B(Star1),
B(LdaConstant), U8(1),
B(Star2),
Expand Down Expand Up @@ -292,13 +292,13 @@ bytecodes: [
B(TestReferenceEqual), R(this),
B(Mov), R(this), R(0),
B(JumpIfTrue), U8(16),
B(Wide), B(LdaSmi), I16(308),
B(Wide), B(LdaSmi), I16(309),
B(Star2),
B(LdaConstant), U8(0),
B(Star3),
/* 65 E> */ B(CallRuntime), U16(Runtime::kNewTypeError), R(2), U8(2),
B(Throw),
B(Wide), B(LdaSmi), I16(316),
B(Wide), B(LdaSmi), I16(317),
B(Star2),
B(LdaConstant), U8(1),
B(Star3),
Expand Down Expand Up @@ -327,7 +327,7 @@ bytecode array length: 19
bytecodes: [
/* 46 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
/* 51 E> */ B(GetKeyedProperty), R(this), U8(0),
B(Wide), B(LdaSmi), I16(315),
B(Wide), B(LdaSmi), I16(316),
B(Star1),
B(LdaConstant), U8(0),
B(Star2),
Expand Down