Skip to content

Commit

Permalink
Bug 1732147 - Bump jsparagus for bug 1718635 and bug 1718952. r=nbp
Browse files Browse the repository at this point in the history
  • Loading branch information
arai-a committed Sep 23, 2021
1 parent fc1706a commit f1e9f6c
Show file tree
Hide file tree
Showing 15 changed files with 451 additions and 442 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"
[source."https://github.com/mozilla-spidermonkey/jsparagus"]
git = "https://github.com/mozilla-spidermonkey/jsparagus"
replace-with = "vendored-sources"
rev = "6c97434b6586fc234fdba0494f4ddd004b9578de"
rev = "ecc433935118a4ff22d33c4fe7c625a5d0bfb571"

[source."https://github.com/kvark/dummy-web"]
git = "https://github.com/kvark/dummy-web"
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/src/frontend/smoosh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ log = "0.4"
# Disable regex feature for code size.
env_logger = {version = "0.8", default-features = false}
# For non-jsparagus developers.
jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "6c97434b6586fc234fdba0494f4ddd004b9578de" }
jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "ecc433935118a4ff22d33c4fe7c625a5d0bfb571" }
# For local development, replace above with
# jsparagus = { path = "{path to jsparagus}" }

[build-dependencies]
# For non-jsparagus developers.
jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "6c97434b6586fc234fdba0494f4ddd004b9578de" }
jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "ecc433935118a4ff22d33c4fe7c625a5d0bfb571" }
# For local development, replace above with
# jsparagus = { path = "{path to jsparagus}" }
2 changes: 1 addition & 1 deletion third_party/rust/jsparagus-emitter/.cargo-checksum.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"Cargo.toml":"00c740f44b5681e3277e519d2e143e6edfbff186ca31a07ddce2eb46b803ddd7","src/array_emitter.rs":"bbc6528321f1d11d7c86c4f2bfdcfc9dced8f0b8b1c30c9f0a5355f300d196b6","src/ast_emitter.rs":"050858e25f6bab6787771058afe504c66e74e9026e9ce873160bccc6366eca47","src/block_emitter.rs":"78965260d87a66c5324d6f3bdfea0f1938f8037f70adde148dbb2db599d1b2c0","src/compilation_info.rs":"b0d91b0f8d6940cb7087b474c3c814b758c8ce8d9027c415b76ad4af78be6140","src/control_structures.rs":"b32fbfff53bd378dcb45d63620006bea15c2fec1e7bc0bb163567dfe086e4931","src/dis.rs":"4a335d813fa965482ca0f20a7b9295a55ce7625b577d42bd8b33b156b81c6306","src/emitter.rs":"9237b6dd09545427c0c2203e8e22ef12873242096fcec5200cb3acd2ff3b5627","src/emitter_scope.rs":"93c2b2a324ccb46b74adb2a28f56360a32652088e59c03641b4f1b608549dc78","src/expression_emitter.rs":"f8e02785dffb179bbe9fe58e45bbfccc08adc3ad0a071a0073bed0feedc8ed9a","src/function_declaration_emitter.rs":"0e6ae706ced215882f3a45b6e13f022ec1effa8edf1026b7ba7988810646982b","src/lib.rs":"e256eceee1eb7ea66fe855fcc3fa2fff187977f9adca2754872d13e9bb788536","src/object_emitter.rs":"998423b3d6ef8797fadef6763803627df72fde292b1b34d6a41b2e66a331a181","src/reference_op_emitter.rs":"c0c0ddde1613ab843dd3ee82744513bdd4f574432a06d5a88978e7ff1ce08273","src/script_emitter.rs":"150a3d6330f40099ad1df8c52cd1831e3ef0fd4eecf44a20e3fff7acef2dd640"},"package":null}
{"files":{"Cargo.toml":"00c740f44b5681e3277e519d2e143e6edfbff186ca31a07ddce2eb46b803ddd7","src/array_emitter.rs":"bbc6528321f1d11d7c86c4f2bfdcfc9dced8f0b8b1c30c9f0a5355f300d196b6","src/ast_emitter.rs":"050858e25f6bab6787771058afe504c66e74e9026e9ce873160bccc6366eca47","src/block_emitter.rs":"78965260d87a66c5324d6f3bdfea0f1938f8037f70adde148dbb2db599d1b2c0","src/compilation_info.rs":"b0d91b0f8d6940cb7087b474c3c814b758c8ce8d9027c415b76ad4af78be6140","src/control_structures.rs":"b32fbfff53bd378dcb45d63620006bea15c2fec1e7bc0bb163567dfe086e4931","src/dis.rs":"4a335d813fa965482ca0f20a7b9295a55ce7625b577d42bd8b33b156b81c6306","src/emitter.rs":"3328ae31d749e6b36d8ff93d271c194500debcb2f49629f4d1c4f44970497481","src/emitter_scope.rs":"93c2b2a324ccb46b74adb2a28f56360a32652088e59c03641b4f1b608549dc78","src/expression_emitter.rs":"f8e02785dffb179bbe9fe58e45bbfccc08adc3ad0a071a0073bed0feedc8ed9a","src/function_declaration_emitter.rs":"0e6ae706ced215882f3a45b6e13f022ec1effa8edf1026b7ba7988810646982b","src/lib.rs":"f91576fb0f1e3cf444dd1d8ee25ee9bfd0b1e890e427a3863fdb6a4ad1611b61","src/object_emitter.rs":"998423b3d6ef8797fadef6763803627df72fde292b1b34d6a41b2e66a331a181","src/reference_op_emitter.rs":"e1507033c17318f59dbbdd1514d1bd1263f0c7d72530d0f2b2ab071d58b39f72","src/script_emitter.rs":"150a3d6330f40099ad1df8c52cd1831e3ef0fd4eecf44a20e3fff7acef2dd640"},"package":null}
9 changes: 4 additions & 5 deletions third_party/rust/jsparagus-emitter/src/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,10 @@ impl InstructionWriter {
self.emit_op(Opcode::GlobalThis);
}

pub fn non_syntactic_global_this(&mut self) {
self.emit_op(Opcode::NonSyntacticGlobalThis);
}

pub fn new_target(&mut self) {
self.emit_op(Opcode::NewTarget);
}
Expand Down Expand Up @@ -832,11 +836,6 @@ impl InstructionWriter {
self.write_g_c_thing_index(name_index);
}

pub fn g_implicit_this(&mut self, name_index: GCThingIndex) {
self.emit_op(Opcode::GImplicitThis);
self.write_g_c_thing_index(name_index);
}

pub fn call_site_obj(&mut self, object_index: GCThingIndex) {
self.emit_op(Opcode::CallSiteObj);
self.write_g_c_thing_index(object_index);
Expand Down
6 changes: 1 addition & 5 deletions third_party/rust/jsparagus-emitter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,7 @@ mod tests {
0,
0,
0,
Opcode::GImplicitThis as u8,
1,
0,
0,
0,
Opcode::Undefined as u8,
Opcode::Call as u8,
0,
0,
Expand Down
12 changes: 10 additions & 2 deletions third_party/rust/jsparagus-emitter/src/reference_op_emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,22 @@ impl NameReferenceEmitter {
emitter.emit.get_g_name(name_index);
// [stack] CALLEE

emitter.emit.g_implicit_this(name_index);
// NOTE: We don't support non-syntactic scope.
// See NameOpEmitter::emitGet in SpiderMonkey for omitted
// cases.

emitter.emit.undefined();
// [stack] CALLEE THIS
}
NameLocation::Dynamic => {
emitter.emit.get_name(name_index);
// [stack] CALLEE

emitter.emit.g_implicit_this(name_index);
// NOTE: We don't support non-syntactic scope or with statement.
// See NameOpEmitter::emitGet in SpiderMonkey for omitted
// cases.

emitter.emit.undefined();
// [stack] CALLEE THIS
}
NameLocation::FrameSlot(slot, kind) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"Cargo.toml":"553be3c198fe555913bbeb7473b24e0e1fff12e48890a2e399b311df8a97c814","src/ast_builder.rs":"15eebf519763b94e7c11791a1a90b1f73ec00d447857e230232e1d45599e30e5","src/context_stack.rs":"29331d03cd4c8ee9283cb426ebe893b7ba6ad6d8a69016399c4d92a81cb1363b","src/declaration_kind.rs":"fdfda2fe408cce1c637d17fee0813160619450472c6de9befc36ebeed892cc3c","src/early_error_checker.rs":"89da86f7f78392cb60a909c240e430779eed0fc250b3b3c8466665eeaf2fbc25","src/early_errors.rs":"8674454af7ac5efe51eb6a8e2abe088aad5560e0a0bd88a3eae66c90f1527149","src/error.rs":"507e4dd9c66720f3da2db135c3024392d8aaac5ccdb90c7f7463ccb2eff7efa8","src/lib.rs":"b74105a84c4a141b880439f9ec724f7dc08224342be08a73490ac2c01410af08","src/parser_tables_generated.rs":"4167c62cde091c49a50383654010d23d07091fa3ebf2486e90d93d6d78e514dd","src/stack_value_generated.rs":"ce8567634ff2bb818593f56c0589b4ba2d508704db943eb0778d79dfd19cce36","src/token.rs":"479f4cb97d2e6bc654a70634f3809817cc73eaf749c845643beb3556b9ead383","src/traits/mod.rs":"ba74c71f7218027f8188247bc64df243117613fbc9893d40799402ef1e6dbf59"},"package":null}
{"files":{"Cargo.toml":"553be3c198fe555913bbeb7473b24e0e1fff12e48890a2e399b311df8a97c814","src/ast_builder.rs":"15eebf519763b94e7c11791a1a90b1f73ec00d447857e230232e1d45599e30e5","src/context_stack.rs":"29331d03cd4c8ee9283cb426ebe893b7ba6ad6d8a69016399c4d92a81cb1363b","src/declaration_kind.rs":"fdfda2fe408cce1c637d17fee0813160619450472c6de9befc36ebeed892cc3c","src/early_error_checker.rs":"89da86f7f78392cb60a909c240e430779eed0fc250b3b3c8466665eeaf2fbc25","src/early_errors.rs":"8674454af7ac5efe51eb6a8e2abe088aad5560e0a0bd88a3eae66c90f1527149","src/error.rs":"507e4dd9c66720f3da2db135c3024392d8aaac5ccdb90c7f7463ccb2eff7efa8","src/lib.rs":"b74105a84c4a141b880439f9ec724f7dc08224342be08a73490ac2c01410af08","src/parser_tables_generated.rs":"0b2bd55a226cd952c115ac136e2927fadaaf81f473abe6e53793b6e5f3eb73dd","src/stack_value_generated.rs":"ce8567634ff2bb818593f56c0589b4ba2d508704db943eb0778d79dfd19cce36","src/token.rs":"479f4cb97d2e6bc654a70634f3809817cc73eaf749c845643beb3556b9ead383","src/traits/mod.rs":"ba74c71f7218027f8188247bc64df243117613fbc9893d40799402ef1e6dbf59"},"package":null}
Loading

0 comments on commit f1e9f6c

Please sign in to comment.