Root dictionaries that contain any or object. #15544

Ms2ger · 2017-02-14T15:55:57Z

This change is

highfive · 2017-02-14T15:56:00Z

Heads up! This PR modifies the following files:

@fitzgen: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/request.rs, components/script/dom/testbinding.rs, components/script/dom/popstateevent.rs, components/script/dom/bindings/mozmap.rs, components/script/dom/errorevent.rs, components/script/dom/bindings/conversions.rs, components/script/fetch.rs, components/script/dom/extendablemessageevent.rs, components/script/dom/bindings/trace.rs, components/script/dom/messageevent.rs, components/script/dom/customevent.rs, components/script/dom/bindings/js.rs, components/script/dom/bindings/iterable.rs, components/script/dom/filereader.rs, components/script/dom/window.rs, components/script/dom/workerglobalscope.rs
@KiChjang: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/request.rs, components/script/dom/testbinding.rs, components/script/dom/popstateevent.rs, components/script/dom/bindings/mozmap.rs, components/script/dom/errorevent.rs, components/script/dom/bindings/conversions.rs, components/script/fetch.rs, components/script/dom/extendablemessageevent.rs, components/script/dom/bindings/trace.rs, components/script/dom/messageevent.rs, components/script/dom/customevent.rs, components/script/dom/bindings/js.rs, components/script/dom/bindings/iterable.rs, components/script/dom/filereader.rs, components/script/dom/window.rs, components/script/dom/workerglobalscope.rs

highfive · 2017-02-14T15:56:02Z

Warning

These commits modify unsafe code. Please review it carefully!

nox · 2017-02-14T16:02:13Z

@bors-servo r+

bors-servo · 2017-02-14T16:02:15Z

📌 Commit 9c4a147 has been approved by nox

bors-servo · 2017-02-14T18:35:12Z

⌛ Testing commit 9c4a147 with merge 1f3c108...


        Auto merge of #15544 - servo:RootedTraceable-dict, r=nox

Root dictionaries that contain any or object.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15544)

bors-servo · 2017-02-14T18:41:56Z

💔 Test failed - mac-dev-unit

bors-servo · 2017-02-15T10:21:12Z

☔ The latest upstream changes (presumably #15545) made this pull request unmergeable. Please resolve the merge conflicts.

bors-servo · 2017-02-15T17:18:16Z

☔ The latest upstream changes (presumably #15563) made this pull request unmergeable. Please resolve the merge conflicts.

Ms2ger · 2017-02-15T17:22:11Z

@bors-servo r=nox

bors-servo · 2017-02-15T17:22:12Z

📌 Commit 87b02fc has been approved by nox

bors-servo · 2017-02-15T18:34:02Z

⌛ Testing commit 87b02fc with merge bc0aa68...

bors-servo · 2017-02-15T19:11:38Z

💔 Test failed - linux-rel-wpt

jdm · 2017-02-15T19:26:04Z

 ▶ CRASH [expected OK] /_mozilla/mozilla/binding_keyword.html
  │ 
  │ VMware, Inc.
  │ Gallium 0.4 on softpipe
  │ 3.3 (Core Profile) Mesa 12.0.1
  │ assertion failed: !obj.is_null() (thread ScriptThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(1) }, at /home/servo/.cargo/git/checkouts/rust-mozjs-8611526964119dd6/02e4cc0/src/rust.rs:1140)
  │ stack backtrace:
  │    0:     0x7f6b84d0511d - backtrace::backtrace::trace::h4e46a0cd30889b9c
  │    1:     0x7f6b84d05602 - backtrace::capture::Backtrace::new::hb5a725a088a2a2fc
  │    2:     0x7f6b83664f73 - servo::main::{{closure}}::h9d96b5c32a8afffa
  │    3:     0x7f6b854ecbad - std::panicking::rust_panic_with_hook
  │                         at /checkout/src/libstd/panicking.rs:546
  │    4:     0x7f6b839ec59f - std::panicking::begin_panic::h1c2b9bb7e76a9e91
  │    5:     0x7f6b839e0e75 - js::rust::maybe_wrap_object_value::h2a3a268aca9040e9
  │    6:     0x7f6b84167d90 - <script::dom::bindings::codegen::Bindings::TestBindingBinding::TestDictionaryDefaults as js::conversions::ToJSValConvertible>::to_jsval::hff3853414b37731c
  │    7:     0x7f6b8415bb8a - <script::dom::bindings::codegen::Bindings::TestBindingBinding::TestDictionary as js::conversions::ToJSValConvertible>::to_jsval::h81a7f194dbf92388
  │    8:     0x7f6b83abac05 - std::panicking::try::do_call::h8151dca8f9ff31ea
  │    9:     0x7f6b854f3aea - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   10:     0x7f6b84180274 - script::dom::bindings::codegen::Bindings::TestBindingBinding::TestBindingBinding::receiveTestDictionaryWithSuccessOnKeyword::h2167aba7dc49fc08
  │   11:     0x7f6b84240134 - CallJitMethodOp
  │   12:     0x7f6b83cec7fb - script::dom::bindings::utils::generic_call::he04b13e317ccbd26
  │   13:     0x7f6b8459bfc0 - CallJSNative
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jscntxtinlines.h:232
  │                          - 2js23InternalCallOrConstructEP9JSContextRKN2JS8CallArgsENS_14MaybeConstruct
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:453
  │   14:     0x7f6b8458e93e - CallFromStack
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:504
  │                          - Interpret
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:2873
  │   15:     0x7f6b8459bb8b - 2js9RunScriptEP9JSContextRNS_8RunState
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:399
  │   16:     0x7f6b8459bd68 - 2js23InternalCallOrConstructEP9JSContextRKN2JS8CallArgsENS_14MaybeConstruct
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:471
  │   17:     0x7f6b8459c174 - 2js4CallEP9JSContextN2JS6HandleINS2_5ValueEEES5_RKNS_13AnyInvokeArgsENS2_13MutableHandleIS4_E
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:517
  │   18:     0x7f6b84499e4f - 2js9fun_applyEP9JSContextjPN2JS5Value
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jsfun.cpp:1325
  │   19:     0x7f6b8459bfc0 - CallJSNative
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jscntxtinlines.h:232
  │                          - 2js23InternalCallOrConstructEP9JSContextRKN2JS8CallArgsENS_14MaybeConstruct
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:453
  │   20:     0x7f6b8458e93e - CallFromStack
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:504
  │                          - Interpret
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:2873
  │   21:     0x7f6b8459bb8b - 2js9RunScriptEP9JSContextRNS_8RunState
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:399
  │   22:     0x7f6b845a3058 - _ZN2js13ExecuteKernelEP9JSContextN2JS6HandleIP8JSScriptEER8JSObjectRKNS2_5ValueENS_16AbstractFramePtrEPS9_
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:679
  │   23:     0x7f6b845a3187 - 2js7ExecuteEP9JSContextN2JS6HandleIP8JSScriptEER8JSObjectPNS2_5Value
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/vm/Interpreter.cpp:712
  │   24:     0x7f6b84414198 - Evaluate
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jsapi.cpp:4407
  │   25:     0x7f6b844146f6 - Evaluate
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jsapi.cpp:4443
  │                          - 2JS8EvaluateEP9JSContextRKNS_22ReadOnlyCompileOptionsEPKDsmNS_13MutableHandleINS_5ValueEE
  │                         at /home/servo/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/7cd72d8/mozjs/js/src/jsapi.cpp:4501
  │   26:     0x7f6b83db88cf - script::dom::globalscope::GlobalScope::evaluate_script_on_global_with_result::hc8f65669693aaf29
  │   27:     0x7f6b83e18bd6 - script::dom::htmlscriptelement::HTMLScriptElement::run_a_classic_script::hc16e75138cb09e15
  │   28:     0x7f6b83e1823f - script::dom::htmlscriptelement::HTMLScriptElement::execute::h0e4d8c5267ea8c8a
  │   29:     0x7f6b83e159c9 - script::dom::htmlscriptelement::HTMLScriptElement::prepare::h99b6b6c4f92c9cb3
  │   30:     0x7f6b83e85837 - script::dom::servoparser::ServoParser::do_parse_sync::h2676270b9bff96b9
  │   31:     0x7f6b83e8547c - script::dom::servoparser::ServoParser::parse_sync::h4a7419b789141155
  │   32:     0x7f6b83e838b2 - script::dom::servoparser::ServoParser::resume_with_pending_parsing_blocking_script::hdab058dbb249dbf0
  │   33:     0x7f6b83d625f3 - script::dom::document::Document::process_pending_parsing_blocking_script::h9162a653c43d6b47
  │   34:     0x7f6b83d6220e - script::dom::document::Document::pending_parsing_blocking_script_loaded::h62a8d94091094a7f
  │   35:     0x7f6b83e14301 - <script::dom::htmlscriptelement::ScriptContext as net_traits::FetchResponseListener>::process_response_eof::hda245cde86f53f70
  │   36:     0x7f6b83f14f5a - <script::network_listener::ListenerRunnable<A, Listener> as script::script_thread::Runnable>::handler::h178488b363fd3fbb
  │   37:     0x7f6b83f1d24f - <script::script_thread::CancellableRunnable<T> as script::script_thread::Runnable>::handler::h9821788060a178fb
  │   38:     0x7f6b83f37be7 - script::script_thread::ScriptThread::handle_msg_from_script::h4fb921a02f36cead
  │   39:     0x7f6b83f306df - script::script_thread::ScriptThread::handle_msgs::{{closure}}::h95a96e772221ddd7
  │   40:     0x7f6b83f2b24a - script::script_thread::ScriptThread::handle_msgs::hb7c261538c9b5201
  │   41:     0x7f6b83f25b47 - script::script_thread::ScriptThread::start::hb46c4910de904afb
  │   42:     0x7f6b83a6ed18 - std::panicking::try::do_call::h53d8fb9802f75061
  │   43:     0x7f6b854f3aea - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   44:     0x7f6b83bf2067 - <F as alloc::boxed::FnBox<A>>::call_box::h8215f58d0e67ccd1
  │   45:     0x7f6b854eb7f4 - alloc::boxed::{{impl}}::call_once<(),()>
  │                         at /checkout/src/liballoc/boxed.rs:640
  │                          - std::sys_common::thread::start_thread
  │                         at /checkout/src/libstd/sys_common/thread.rs:21
  │                          - std::sys::imp::thread::{{impl}}::new::thread_start
  │                         at /checkout/src/libstd/sys/unix/thread.rs:84
  │   46:     0x7f6b8152f183 - start_thread
  │   47:     0x7f6b8104637c - clone
  │   48:                0x0 - <unknown>
  │ ERROR:servo: assertion failed: !obj.is_null()
  └ Pipeline failed in hard-fail mode.  Crashing!


        Update js.


        Pass isMember to getJSToNativeConversionInfo for unions.

Also includes a documentation update for isMember.


        Share a little less code between the branches for conversion to any.


        Use Heap for dictionary and union members.


        Implement JSTraceable for more types.


        Use from_jsval for dictionaries.


        Introduce RootedTraceableBox.


        Use RootedTraceableBox for dictionaries.

Ms2ger · 2017-02-16T10:03:52Z

@bors-servo r=nox

bors-servo · 2017-02-16T10:03:52Z

📌 Commit f7e2f0e has been approved by nox

bors-servo · 2017-02-16T10:03:56Z

⌛ Testing commit f7e2f0e with merge 0cc6d3e...


        Auto merge of #15544 - servo:RootedTraceable-dict, r=nox

Root dictionaries that contain any or object.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15544)

bors-servo · 2017-02-16T10:58:50Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: nox
Pushing 0cc6d3e to master...

highfive assigned nox Feb 14, 2017

highfive added the S-awaiting-review label Feb 14, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Feb 14, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Feb 14, 2017

highfive added the S-needs-rebase label Feb 15, 2017

Ms2ger force-pushed the RootedTraceable-dict branch from 9c4a147 to ea2cef4 Feb 15, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Feb 15, 2017

highfive added the S-needs-rebase label Feb 15, 2017

Ms2ger force-pushed the RootedTraceable-dict branch 2 times, most recently from 591fca1 to 87b02fc Feb 15, 2017

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Feb 15, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Feb 15, 2017

Ms2ger added 8 commits Feb 15, 2017

Update js.

2a50427

Pass isMember to getJSToNativeConversionInfo for unions.

7d24cd7

Also includes a documentation update for isMember.

Share a little less code between the branches for conversion to any.

5eaa19b

Use Heap for dictionary and union members.

8ce9ca6

Implement JSTraceable for more types.

3613e8f

Use from_jsval for dictionaries.

8c8eb41

Introduce RootedTraceableBox.

f1605ab

Use RootedTraceableBox for dictionaries.

Loading status checks…

f7e2f0e

Ms2ger force-pushed the RootedTraceable-dict branch from 87b02fc to f7e2f0e Feb 16, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Feb 16, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Feb 16, 2017

highfive removed the S-awaiting-merge label Feb 16, 2017

bors-servo mentioned this pull request Feb 16, 2017

Pass typed array structs as arguments to binding methods. #15007

Closed

Ms2ger deleted the RootedTraceable-dict branch Feb 16, 2017

servo / servo

Root dictionaries that contain any or object. #15544

Root dictionaries that contain any or object. #15544

Ms2ger commented Feb 14, 2017 •

edited by larsbergstrom

highfive commented Feb 14, 2017

highfive commented Feb 14, 2017

nox commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

Ms2ger commented Feb 15, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

jdm commented Feb 15, 2017

Ms2ger commented Feb 16, 2017

bors-servo commented Feb 16, 2017

bors-servo commented Feb 16, 2017

bors-servo commented Feb 16, 2017

servo / servo

Join GitHub today

Root dictionaries that contain any or object. #15544

Root dictionaries that contain any or object. #15544

Conversation

Ms2ger commented Feb 14, 2017 • edited by larsbergstrom

highfive commented Feb 14, 2017

highfive commented Feb 14, 2017

nox commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 14, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

Ms2ger commented Feb 15, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

bors-servo commented Feb 15, 2017

jdm commented Feb 15, 2017

Ms2ger commented Feb 16, 2017

bors-servo commented Feb 16, 2017

bors-servo commented Feb 16, 2017

bors-servo commented Feb 16, 2017

Ms2ger commented Feb 14, 2017 •

edited by larsbergstrom