deps: V8: cherry-pick d5f08e4 · nodejs/node@e6af220 (original) (raw)

4 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
37 37
38 38 # Reset this number to 0 on major V8 upgrades.
39 39 # Increment by one for each non-official patch applied to deps/v8.
40 -'v8_embedder_string': '-node.6',
40 +'v8_embedder_string': '-node.7',
41 41
42 42 ##### V8 defaults for Node.js #####
43 43
Original file line number Diff line number Diff line change
@@ -6497,10 +6497,6 @@ class V8_EXPORT Extension { // NOLINT
6497 6497 bool auto_enable_;
6498 6498 };
6499 6499
6500 -V8_DEPRECATED(
6501 -"Use unique_ptr version or stop using extension (http://crbug.com/334679).",
6502 -void V8_EXPORT RegisterExtension(Extension* extension));
6503 -
6504 6500 void V8_EXPORT RegisterExtension(std::unique_ptr);
6505 6501
6506 6502 // --- Statics ---
Original file line number Diff line number Diff line change
@@ -898,19 +898,9 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
898 898
899 899 RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
900 900
901 -RegisteredExtension::RegisteredExtension(Extension* extension)
902 - : legacy_unowned_extension_(extension) {}
903 -
904 901 RegisteredExtension::RegisteredExtension(std::unique_ptr extension)
905 902 : extension_(std::move(extension)) {}
906 903
907 -// static
908 -void RegisteredExtension::Register(Extension* extension) {
909 - RegisteredExtension* new_extension = new RegisteredExtension(extension);
910 - new_extension->next_ = first_extension_;
911 - first_extension_ = new_extension;
912 -}
913 -
914 904 // static
915 905 void RegisteredExtension::Register(std::unique_ptr extension) {
916 906 RegisteredExtension* new_extension =
@@ -946,8 +936,6 @@ class ExtensionResource : public String::ExternalOneByteStringResource {
946 936 };
947 937 } // anonymous namespace
948 938
949 -void RegisterExtension(Extension* that) { RegisteredExtension::Register(that); }
950 -
951 939 void RegisterExtension(std::unique_ptr extension) {
952 940 RegisteredExtension::Register(std::move(extension));
953 941 }
Original file line number Diff line number Diff line change
@@ -71,20 +71,14 @@ class ApiFunction {
71 71
72 72 class RegisteredExtension {
73 73 public:
74 -static void Register(Extension*);
75 74 static void Register(std::unique_ptr);
76 75 static void UnregisterAll();
77 - Extension* extension() const {
78 -return legacy_unowned_extension_ ? legacy_unowned_extension_
79 - : extension_.get();
80 - }
76 + Extension* extension() const { return extension_.get(); }
81 77 RegisteredExtension* next() const { return next_; }
82 78 static RegisteredExtension* first_extension() { return first_extension_; }
83 79 private:
84 80 explicit RegisteredExtension(Extension*);
85 81 explicit RegisteredExtension(std::unique_ptr);
86 -// TODO(clemensh): Remove this after the 7.4 branch.
87 - Extension* legacy_unowned_extension_ = nullptr;
88 82 std::unique_ptr extension_;
89 83 RegisteredExtension* next_ = nullptr;
90 84 static RegisteredExtension* first_extension_;