Update SpiderMonkey to m-c bcf4ff0c3eef. #12255

Ms2ger · 2016-07-05T07:37:42Z

This currently breaks Servo on Android, because there are a number of interdependent changes that cannot easily land serially in a way that keeps it working throughout. We expect to fix this in the near future.

This change is

highfive · 2016-07-05T07:37:46Z

Heads up! This PR modifies the following files:

@KiChjang: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/bindings/callback.rs, components/script/dom/bindings/interface.rs, components/script/dom/browsingcontext.rs, components/script/Cargo.toml, components/script/dom/bindings/error.rs, components/script/dom/bindings/proxyhandler.rs

highfive · 2016-07-05T07:37:46Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify script code, but no tests are modified. Please consider adding a test!

Ms2ger · 2016-07-05T07:37:47Z

@bors-servo try

bors-servo · 2016-07-05T07:37:49Z

⌛ Trying commit 0eb1b06 with merge 90bb904...

Smup

bors-servo · 2016-07-05T07:41:57Z

💔 Test failed - arm64

nox · 2016-07-05T08:42:43Z

-S-awaiting-review

Reviewed 3 of 3 files at r1, 6 of 6 files at r2.
Review status: all files reviewed at latest revision, 4 unresolved discussions, some commit checks failed.

components/script/dom/bindings/callback.rs, line 198 [r2] (raw file):

            unsafe {
                let _ac = JSAutoCompartment::new(self.cx, *self.exception_compartment);
                // XXX JS_ReportPendingException(self.cx);

Why?

components/script/dom/bindings/error.rs, line 127 [r2] (raw file):

    if JS_IsExceptionPending(cx) {
        let _ac = JSAutoCompartment::new(cx, obj);
        // XXX JS_ReportPendingException(cx);

Why?

components/script/dom/bindings/interface.rs, line 154 [r2] (raw file):

    /// Create a new `NonCallbackInterfaceObjectClass` structure.
    pub const fn new(ops: &'static ClassOps,

If you make InterfaceConstructorBehavior wrap a ClassOps instead, the only needed change is ops: &'static InterfaceConstructorBehavior.

components/script/dom/bindings/interface.rs, line 190 [r2] (raw file):

    call: JSNative,
    construct: JSNative,
}

Could you instead just make that wrap a ClassOps?

Comments from Reviewable

bors-servo · 2016-07-07T05:47:09Z

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

Ms2ger · 2016-07-12T11:56:39Z

@bors-servo try

bors-servo · 2016-07-12T11:56:41Z

⌛ Trying commit eb3c72f with merge 90b3b09...

Smup  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12255)

bors-servo · 2016-07-12T12:04:25Z

💔 Test failed - windows

Ms2ger · 2016-07-12T12:46:16Z

@bors-servo try

bors-servo · 2016-07-12T12:47:52Z

⌛ Trying commit e0da4d0 with merge 2b96de4...

Smup  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12255)

bors-servo · 2016-07-12T13:04:55Z

💔 Test failed - windows

bors-servo · 2016-07-13T22:18:01Z

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

larsbergstrom · 2016-07-22T01:55:12Z

@froydnj I just spent the evening trying to reproduce the configure scripts reproduction of:

translating target triples to google-android-target triples to find gcc
similar hackery to get a valid --sysroot
And I think I have that working.

However, the libc++_static.a is in, e.g., ./sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_static.a, and it's not at all clear to me how to get that on the library include path. Is there some special magic I should be doing here?

Ms2ger · 2016-07-22T08:47:49Z

That's $cxx_libs in android.m4; not sure how to get that out of there. (Note that changing android.m4 requires re-running autoconf2.13 on old-configure.in.)

larsbergstrom · 2016-07-22T13:25:17Z

@Ms2ger You're right! I probably need to reproduce the behavior in:
https://dxr.mozilla.org/mozilla-central/source/build/autoconf/android.m4?q=android.m4&redirect_type=direct#139-161

Kinda annoying, as I think this means that I need to duplicate it in fake-ld.sh (to construct the linker line) and several separate build.rs files. Maybe I should do the detection / env var setting in the python code in mach, so that it's at least only in one place? I'm not sure there's a good solution, with various bits of build hackery scattered across a handful of build systems.

I'll probably go with the "bash my head against it until it works" solution to get the SMUP landed, but figuring out a better way to deal with Android NDK detection would be nice in general. It's already in a pretty... fragile... state.

larsbergstrom · 2016-07-22T17:05:40Z

In good news, I've got a build that now links against c++_static and properly resolves those symbols.

In bad news, since many of our other dependencies still link against stlport, we now have ~90 undefined symbols of the form _ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E.

Hopefully, this is just a matter of rebuilding the whole tree with magically repointed include directories. WHAT COULD POSSIBLY GO WRONG? :-)

larsbergstrom · 2016-07-24T19:00:35Z

@froydnj Have you ever seen the following error (about a bunch of missing really basic C symbols)? I've got most of our native deps compiling w/ the LLVM libc++ and no standalone NDK (freetype, SM, azure, skia, openssl), but angle is still giving me some fits:

error: failed to run custom build command for `angle v0.1.0 (https://github.com/servo/angle?branch=servo#d0a2db05)`
Process didn't exit successfully: `/Users/larsberg/servo/target/debug/build/angle-7062634bbf237306/build-script-build` (exit code: 101)
--- stdout
arm-linux-androideabi-g++ src/glslang-c.cpp -o /Users/larsberg/servo/target/arm-linux-androideabi/debug/build/angle-7062634bbf237306/out/src/glslang-c.o -c --sysroot /Users/larsberg/android-ndk-r12b/platforms/android-18/arch-arm -I/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include -Wall -std=gnu++11 -DANGLE_TRANSLATOR_STATIC -DANGLE_ENABLE_GLSL -DLIBGLESV2_EXPORT_H_ -DANGLE_EXPORT="" -Iinclude -Isrc -O3 -Wall -DCOMPONENT_BUILD  -fPIC

--- stderr
In file included from /Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:107:0,
                 from /Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/string:438,
                 from include/GLSLANG/ShaderLang.h:31,
                 from src/glslang-c.cpp:1:
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwctype:88:9: error: '::iswblank' has not been declared
 using ::iswblank;
         ^
In file included from /Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/string:438:0,
                 from include/GLSLANG/ShaderLang.h:31,
                 from src/glslang-c.cpp:1:
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:132:9: error: '::vfwscanf' has not been declared
 using ::vfwscanf;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:133:9: error: '::vswscanf' has not been declared
 using ::vswscanf;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:134:9: error: '::vwscanf' has not been declared
 using ::vwscanf;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:150:9: error: '::wcstof' has not been declared
 using ::wcstof;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:151:9: error: '::wcstold' has not been declared
 using ::wcstold;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:155:9: error: '::wcstoll' has not been declared
 using ::wcstoll;
         ^
/Users/larsberg/android-ndk-r12b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar:159:9: error: '::wcstoull' has not been declared
 using ::wcstoull;
         ^
make: *** [/Users/larsberg/servo/target/arm-linux-androideabi/debug/build/angle-7062634bbf237306/out/src/glslang-c.o] Error 1
thread 'main' panicked at 'assertion failed: Command::new("make").args(&["-R", "-f", "makefile.cargo",
                            &format!("-j{}" , env :: var ( "NUM_JOBS" ) .
                                     unwrap (
                                     ))]).status().unwrap().success()', /Users/larsberg/servo/.cargo/git/checkouts/angle-017278ddf8240375/servo/build.rs:10
note: Run with `RUST_BACKTRACE=1` for a backtrace.

[Warning] Could not generate notification! Optional Python module 'pyobjc' is not installed.
Build completed in 0:03:55

larsbergstrom · 2016-07-27T19:07:29Z

The plan for now is to disable Android (servo/saltfs#450), get this landed, and come back to it after the msvc support has also landed.

@nox @Ms2ger Please finish reviews and squash this for landing, after I get the salt change approved and deployed.

Ms2ger · 2016-07-27T19:28:43Z

OK, I'll wrap it up tomorrow.

larsbergstrom · 2016-07-28T00:24:57Z

servo/saltfs#450 has landed and been rolled out, so you should be good to go here. Thanks!

This currently breaks Servo on Android, because there are a number of interdependent changes that cannot easily land serially in a way that keeps it working throughout. We expect to fix this in the near future.

Ms2ger · 2016-07-28T11:12:48Z

Review status: 0 of 7 files reviewed at latest revision, all discussions resolved, some commit checks failed.

components/script/dom/bindings/error.rs, line 127 [r2] (raw file):

Previously, nox (Anthony Ramine) wrote…

Why?

Fixed

components/script/dom/bindings/interface.rs, line 154 [r2] (raw file):

Previously, nox (Anthony Ramine) wrote…

If you make InterfaceConstructorBehavior wrap a ClassOps instead, the only needed change is ops: &'static InterfaceConstructorBehavior.

Not done, because it caused a segfault. Might be worth trying to fix it after this lands.

Comments from Reviewable

jdm · 2016-07-28T11:24:35Z

@bors-servo: r+

bors-servo · 2016-07-28T11:24:36Z

📌 Commit 89efccc has been approved by jdm

bors-servo · 2016-07-28T11:59:00Z

⌛ Testing commit 89efccc with merge 5ae1fcd...

Update SpiderMonkey to m-c bcf4ff0c3eef. This currently breaks Servo on Android, because there are a number of interdependent changes that cannot easily land serially in a way that keeps it working throughout. We expect to fix this in the near future.  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12255)

bors-servo · 2016-07-28T12:58:45Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

froydnj · 2016-07-28T13:40:37Z

@larsbergstrom Sorry for not responding sooner! Gmail failed to highlight your message as important. 😞

This is what Gecko does for -I and -l flags:

http://dxr.mozilla.org/mozilla-central/source/build/autoconf/android.m4#170

It looks like your command line got truncated somehow, so I can't tell if you have all those -I flags, but my guess is that you're missing the -I$NDK/android/support/include bit somewhere.

highfive assigned asajeffrey Jul 5, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 5, 2016

bors-servo pushed a commit that referenced this pull request Jul 5, 2016

Auto merge of #12255 - servo:smup, r=<try>

90bb904

Smup

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 5, 2016

nox removed the S-awaiting-review There is new code that needs to be reviewed. label Jul 5, 2016

nox assigned nox and unassigned asajeffrey Jul 5, 2016

highfive added S-needs-rebase There are merge conflict errors. S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 7, 2016

Ms2ger force-pushed the smup branch from 5218854 to eb3c72f Compare July 12, 2016 11:55

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 12, 2016

highfive removed the S-tests-failed The changes caused existing tests to fail. label Jul 12, 2016

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 12, 2016

vvuk mentioned this pull request Jul 25, 2016

MSVC support for Servo, and CMake builds for native code #11756

Merged

Ms2ger force-pushed the smup branch from a3da5f5 to ba35c14 Compare July 28, 2016 11:05

highfive removed the S-tests-failed The changes caused existing tests to fail. label Jul 28, 2016

Update SpiderMonkey to m-c bcf4ff0c3eef.

89efccc

This currently breaks Servo on Android, because there are a number of interdependent changes that cannot easily land serially in a way that keeps it working throughout. We expect to fix this in the near future.

Ms2ger force-pushed the smup branch from ba35c14 to 89efccc Compare July 28, 2016 11:08

Ms2ger changed the title ~~Smup~~ Update SpiderMonkey to m-c bcf4ff0c3eef. Jul 28, 2016

highfive assigned jdm and unassigned nox Jul 28, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Jul 28, 2016

bors-servo merged commit 89efccc into master Jul 28, 2016

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 28, 2016

larsbergstrom mentioned this pull request Jul 29, 2016

Android fails at startup with IllegalArgumentException #12647

Closed

Ms2ger deleted the smup branch August 15, 2016 11:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update SpiderMonkey to m-c bcf4ff0c3eef. #12255

Update SpiderMonkey to m-c bcf4ff0c3eef. #12255

Ms2ger commented Jul 5, 2016 •

edited

highfive commented Jul 5, 2016

highfive commented Jul 5, 2016

Ms2ger commented Jul 5, 2016

bors-servo commented Jul 5, 2016

bors-servo commented Jul 5, 2016

nox commented Jul 5, 2016

bors-servo commented Jul 7, 2016

Ms2ger commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 12, 2016

Ms2ger commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 13, 2016

larsbergstrom commented Jul 22, 2016

Ms2ger commented Jul 22, 2016

larsbergstrom commented Jul 22, 2016

larsbergstrom commented Jul 22, 2016

larsbergstrom commented Jul 24, 2016

larsbergstrom commented Jul 27, 2016

Ms2ger commented Jul 27, 2016

larsbergstrom commented Jul 28, 2016

Ms2ger commented Jul 28, 2016

jdm commented Jul 28, 2016

bors-servo commented Jul 28, 2016

bors-servo commented Jul 28, 2016

bors-servo commented Jul 28, 2016

froydnj commented Jul 28, 2016

Update SpiderMonkey to m-c bcf4ff0c3eef. #12255

Update SpiderMonkey to m-c bcf4ff0c3eef. #12255

Conversation

Ms2ger commented Jul 5, 2016 • edited

highfive commented Jul 5, 2016

highfive commented Jul 5, 2016

Ms2ger commented Jul 5, 2016

bors-servo commented Jul 5, 2016

bors-servo commented Jul 5, 2016

nox commented Jul 5, 2016

bors-servo commented Jul 7, 2016

Ms2ger commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 12, 2016

Ms2ger commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 12, 2016

bors-servo commented Jul 13, 2016

larsbergstrom commented Jul 22, 2016

Ms2ger commented Jul 22, 2016

larsbergstrom commented Jul 22, 2016

larsbergstrom commented Jul 22, 2016

larsbergstrom commented Jul 24, 2016

larsbergstrom commented Jul 27, 2016

Ms2ger commented Jul 27, 2016

larsbergstrom commented Jul 28, 2016

Ms2ger commented Jul 28, 2016

jdm commented Jul 28, 2016

bors-servo commented Jul 28, 2016

bors-servo commented Jul 28, 2016

bors-servo commented Jul 28, 2016

froydnj commented Jul 28, 2016

Ms2ger commented Jul 5, 2016 •

edited