Skip to content
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.

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

Root dictionaries that contain any or object. #15544

Merged
merged 8 commits into from Feb 16, 2017
Merged

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Feb 14, 2017

This change is Reviewable

@highfive
Copy link

highfive commented Feb 14, 2017

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
Copy link

highfive commented Feb 14, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@nox
Copy link
Member

nox commented Feb 14, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Feb 14, 2017

📌 Commit 9c4a147 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 14, 2017

Testing commit 9c4a147 with merge 1f3c108...

bors-servo added a commit that referenced this pull request Feb 14, 2017
Root dictionaries that contain any or object.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15544)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 14, 2017

💔 Test failed - mac-dev-unit

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

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

@Ms2ger Ms2ger force-pushed the RootedTraceable-dict branch from 9c4a147 to ea2cef4 Feb 15, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

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

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

Ms2ger commented Feb 15, 2017

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

📌 Commit 87b02fc has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

Testing commit 87b02fc with merge bc0aa68...

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

💔 Test failed - linux-rel-wpt

@jdm
Copy link
Member

jdm commented Feb 15, 2017

 ▶ 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!
@Ms2ger Ms2ger force-pushed the RootedTraceable-dict branch from 87b02fc to f7e2f0e Feb 16, 2017
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Feb 16, 2017

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 16, 2017

📌 Commit f7e2f0e has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 16, 2017

Testing commit f7e2f0e with merge 0cc6d3e...

bors-servo added a commit that referenced this pull request Feb 16, 2017
Root dictionaries that contain any or object.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15544)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 16, 2017

@bors-servo bors-servo merged commit f7e2f0e into master Feb 16, 2017
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the RootedTraceable-dict branch Feb 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.