Closed Bug 1277341 Opened 4 years ago Closed 4 years ago

Upstream servo/mozjs's patches into m-c

Categories

(Core :: JavaScript Engine, defect, P1)

defect

Tracking

()

RESOLVED FIXED
Iteration:
50.2 - Jul 4

People

(Reporter: fitzgen, Assigned: fitzgen)

References

Details

Apparently rust-mozjs has some patches on top of m-c that we will need to upstream in order to move rust-mozjs into m-c. We should clean them up and land them.
Blocks: 1263289
Flags: qe-verify-
Priority: -- → P2
Whiteboard: [devtools-html]
No longer blocks: 1263289
Blocks: 1263289
Assignee: nobody → nfitzgerald
Status: NEW → ASSIGNED
Iteration: --- → 50.1
Priority: P2 → P1
Here are all the commits from HEAD back to and including the start of the last smup. I think this list should have everything we need to upstream.

> *   2af5849 (HEAD -> master, origin/master, origin/auto, origin/HEAD) Auto merge of #78 - servo:smup, r=larsbergstrom
> |\  
> | * aa5ddaf Disable __thread on mingw
> | * f1419fa Add WinNSPR.cpp implementation
> | * 2869106 Make js/src/configure honor PYTHON
> |/  
> *   8d9893a Auto merge of #77 - servo:smup, r=Ms2ger
> |\  
> | * 2c65eb7 Use travis_wait
> | * 7bc2c1c Make a horrible hack to avoid dllimport/dllexport on Windows
> | * 2e8cfd9 win32: allow msys make when in mingw64/msys2
> | * d2aa907 Disable Intl API everywhere and not just on Windows
> | * aebc483 Use MOZ_FOLD_LIBS
> | * 8767998 Add mozglue and stlport to JS_STANDALONE
> | * 696e823 Hide JSPrincipals::dump
> | * ae5b450 Hide some stuff in jsval_layout
> | * 6697326 Try to cat config.log on configure error
> | * fc6900a Add the zlib module from gecko-dev
> | * 81bb6e5 Make zip and unzip optional
> | * d3730ce Build mozglue as a static library when building JS_STANDALONE
> | * a1e48af Don't try to refresh configure files
> | * 69b922e Hide some debug stuff that can't compile as such with RUST_BINDGEN
> | * 72a34c8 Fix the static library build
> | * ce246d3 Hide some callbacks that use RefPtr
> | * 50f47cf Bind AsmJSCache_Success rather than AsmJSCache_MIN
> | * 15c3e00 Hide JS_ReportErrorNumberVA
> | * 3f099ba Hide JS_Enumerate
> | * 3704545 Hide unions in JSJitInfo
> | * af6efe5 Hide some unions in JSPropertySpec
> | * 87ea8db Hide source hooks
> | * e69aede Hide GarbageCollectionEvent
> | * 1fa3b3e Hide TraceIncomingCCWs
> | * 202297d Dumb down LinkedList for rust-bindgen
> | * e3cadff Dumb down the pointer type in Rooted<T>
> | * 5fd854b Do not use DebugOnly in ElementAdder
> | * f671022 Make CallArgs simple enough for bindgen to understand
> | * 85a4f5f Bump mozjs to 87247e9d2522c926a525d6be0f620342d15be60d
> |/
Summary: Upstream rust-mozjs's patches into m-c → Upstream servo/mozjs's patches into m-c
Depends on: 1279362
Depends on: 1279629
Depends on: 1270076
Depends on: 1279633
Depends on: 1279639
Iteration: 50.1 → 50.2
I think we can close this. All the commits from comment 1 that are reconcilable with m-c have landed or were dupes of things that are in-flight or landed.
Status: ASSIGNED → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Whiteboard: [devtools-html]
You need to log in before you can comment on or make changes to this bug.