Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
506,536 Commits 615 Branches 98 Tags 5.9 GiB
e8f15d975e
Commit Graph

58315 Commits

Author SHA1 Message Date
Iris Hsiao
7e248d8cc9 Merge mozilla-central to autoland 2017-01-06 11:13:22 -05:00
Markus Stange
4bdc4ca0fb Bug 1323100 - Register most of the remaining threadfunc threads with the profiler. r=froydnj 
As far as I can tell, this covers all the remaining threads which we start
using PR_CreateThread, except the ones that are created inside NSPR or NSS,
and except for the Shutdown Watchdog thread in nsTerminator.cpp and the
CacheIO thread. The Shutdown Watchdog thread stays alive past leak detection
during shutdown (by design), so we'd report leaks if we profiled it. The
CacheIO thread seems to stay alive past shutdown leak detection sometimes as
well.

This adds a AutoProfilerRegister stack class for easy registering and
unregistering. There are a few places where we still call
profiler_register_thread() and profiler_unregister_thread() manually, either
because registration happens conditionally, or because there is a variable that
gets put on the stack before the AutoProfilerRegister (e.g. a dynamically
generated thread name). AutoProfilerRegister needs to be the first object on
the stack because it uses its own `this` pointer as the stack top address.

MozReview-Commit-ID: 3vwhS55Yzt

--HG--
extra : rebase_source : 56dd27282e7bd09a7e7dc7ca09ccfe3a0198e7af
 2017-01-05 16:34:26 +01:00
Benjamin Bouvier
aa46f91d69 Bug 1328911: Introduce resilient mode for wasm::BinaryToAst; r=luke 
MozReview-Commit-ID: 3kPyoVPDBYk

--HG--
extra : rebase_source : e2000a29d0010c4a9671a291ab389e5d063c1ec4
 2017-01-05 17:14:46 +01:00
Steve Fink
8ccd756578 Bug 1326134 - Report whether GC poisoning is enabled in profiles, r=jonco 
--HG--
extra : rebase_source : 8b64acda00627b1ab9c8ba3666dc0dc4e51819d9
 2016-12-28 17:12:23 -08:00
Steve Fink
39f806b533 Bug 1326343 - Do not compute with null Timestamp on OOM, r=jonco 
--HG--
extra : rebase_source : f5226b9348a80eb34064f93ce9360d68f11913c9
 2016-12-30 12:01:04 -08:00
Luke Wagner
085a76bd74 Bug 1326501 - Baldr: optimize getFuncName (r=bbouvier) 
MozReview-Commit-ID: DXmL3URqxUC
 2017-01-05 17:05:48 -06:00
Jason Orendorff
5d60d5ca87 Bug 1312001 - Scramble hash codes securely, to avoid leaking bits of object and symbol addresses. 
MozReview-Commit-ID: yR1cIjrlPP

--HG--
extra : rebase_source : 871821e53eee5502cd255d52f02665f6845e3f09
 2016-11-30 15:31:56 -06:00
Hannes Verschore
a4c83904d0 Bug 1312480, r=jandem 2017-01-05 19:33:09 +01:00
David Major
9c47757934 Bug 1329018 - Part 2: Wasm: Move function validation to helper threads. r=luke 
MozReview-Commit-ID: HA9WOoSjZFr

--HG--
extra : rebase_source : f086c17bd9c7cbaf01f95b9d477e26888f83987b
 2017-01-06 17:15:48 -06:00
David Major
ce404f2d14 Bug 1329018 - Part 1: Wasm: Add plumbing for compile threads to report validation errors. r=luke 
MozReview-Commit-ID: 2cS7skk5tdk

--HG--
extra : rebase_source : 24dd758202e5b15efc9a0bbb5aa7f115cee25683
 2017-01-06 17:15:23 -06:00
Sebastian Hengst
9acd1ac77a Backed out changeset 996a1ee2414b (bug 843758) for failing spidermonkey test 11.1.1_20_c.js. r=backout 2017-01-06 16:57:18 +01:00
André Bargull
3799931122 Bug 1328587: Add @@toStringTag property to Intl prototypes per ECMA-402, 2nd edition. r=Waldo 2017-01-04 07:20:16 -08:00
Tom Schuster
30e83038c4 Bug 1323190 - Inline Proxy::get into JIT VM functions. r=jandem 2017-01-06 16:21:44 +01:00
André Bargull
07761c900b Bug 1328128 - Handle negative zero when resolving fraction digit options. r=Waldo 2017-01-05 14:12:43 -08:00
André Bargull
0840b95397 Bug 843758 - Generate currency information for Intl with make_intl_data.py. r=Waldo 2017-01-06 06:02:58 -08:00
Nathan Froyd
f6a73ed989 Bug 1315274 - rename mozilla::MakeRange to mozilla::IntegerRange; r=Waldo 
MakeRange is just way too generic for this sort of thing.
 2017-01-06 09:22:53 -05:00
Jon Coppeard
0e004c9366 Bug 1324773 - Fix test bustage r=me 2017-01-06 11:54:19 +00:00
Jon Coppeard
73e99c3caa Bug 1324773 - Sweep JSCompartment::varNames_ r=sfink a=abillings 2017-01-06 11:23:22 +00:00
Jon Coppeard
925658638d Bug 1323241 - Only report things as gray if gray marking state is valid r=sfink 2017-01-06 11:23:21 +00:00
Yury Delendik
bb1f768e9f Bug 1286948 - onEnterFrame/onLeaveFrame wasm events and callstack. r=shu 
Handles onEnterFrame and onLeaveFrame trap handling. The FrameIter is used in
the DebuggerFrame instead of ScriptFrameIter. The debug wasm frame is created
and can be found on callstack during those event.

MozReview-Commit-ID: 8oyFkrINc0A

--HG--
extra : rebase_source : 5057e1d3a952572129643082cfe8507beb549878
 2017-01-07 10:40:38 -06:00
Yury Delendik
76fa09762a Bug 1286948 - Adds prolog and epilog debug traps and handlers. r=luke 
Using toggled call/traps to invoke handler to process enter and leave
frame events.

MozReview-Commit-ID: APTt3N6Zt0P

--HG--
extra : rebase_source : 1121020f29539e2155bfaea1dc36f07d9a45d003
 2017-01-07 10:38:44 -06:00
Yury Delendik
89670717cb Bug 1286948 - Extends AbstractFramePtr to reference wasm::DebugFrame. r=luke,shu 
Debugger.cpp use FrameIter to walk the stack. Having extended AbstractFramePtr
helps with simulating wasm callstack as JS one.

MozReview-Commit-ID: 7zGWZp33sme

--HG--
extra : rebase_source : b7d8813064f261cf198d05a91361766e320f8590
 2017-01-07 10:36:11 -06:00
Yury Delendik
2f18a92fbc Bug 1286948 - Adds scope and environment for wasm calls. r=luke,shu 
Adds artificial JS scope and environment for wasm frames. That allows
debugger to properly handle call stack.

MozReview-Commit-ID: AgUDw03kK4o

--HG--
extra : rebase_source : 38d0a97e374af6c7cb45ccdd9ed6f9aa5b08216d
 2017-01-07 10:34:31 -06:00
Yury Delendik
7df144f74c Bug 1286948 - Adds debug mode for WASM baseline compiler. r=luke 
Changes logic when debug mode is turned off -- when debug tab is opened.

MozReview-Commit-ID: G7aNqyxA8Rx

--HG--
extra : rebase_source : 851685cbd4397aca314382094f89a76ae16d0792
 2017-01-07 10:34:09 -06:00
André Bargull
485f64c28c Bug 1317376 - Part 2: Detect Promise self-resolution when resolving through the Promise resolving fast path. r=till 
--HG--
extra : rebase_source : 3748ed4c013de6e52fa767d29e56a32ddcdddd71
 2017-01-09 06:58:17 -08:00
André Bargull
bbbfe8d74c Bug 1317376 - Part 1: Remove unreachable code and remnants from the self-hosted implementation. r=till 
--HG--
extra : rebase_source : cf89531b812e1084810d804570e18abd409caf07
 2017-01-09 06:58:14 -08:00
Florian Quèze
fc6379e827 Bug 1329182 - remove trailing newURI null parameters in the rest of the tree, r=jaws. 2017-01-09 20:27:26 +01:00
Emanuel Hoogeveen
cdfd99b7c7 Bug 1329499 - Part 2: Keep outside actors from messing with our old buffer during realloc. r=jandem 
--HG--
extra : rebase_source : 7ee91852e0f64b82a1d42cfd66fadb6ddc03cc4c
 2017-01-09 08:32:00 -05:00
Emanuel Hoogeveen
2af127d5ba Bug 1329499 - Part 1: Detect the jemalloc freed memory poison pattern during append calls. r=jandem 
--HG--
extra : rebase_source : 155c8a903e285978738fb6a31e5accd4d0b5a745
 2017-01-09 08:28:00 -05:00
Jan de Mooij
91b032beba Bug 1326067 part 1 - Change Baseline SetProp IC to leave the RHS value on the stack instead of returning it. r=h4writer 2017-01-05 14:14:19 +01:00
Jan de Mooij
1495b2e5ac Bug 1328227 - Add payload register to availableRegs_ in useValueRegister. r=h4writer 2017-01-05 14:13:53 +01:00
Tooru Fujisawa
b9b4ce1ca0 Bug 1328134 - Clear pending exception when JS::FormatStackDump fails in StackDump. r=evilpie 2017-01-05 20:17:26 +09:00
Benjamin Bouvier
eb70d8c922 Bug 1328639: wasm: Simplify block-value popping in Ion compilation; r=luke 
MozReview-Commit-ID: LRN3CWT91Lt

--HG--
extra : rebase_source : 493664cf29940f9c1c0c61ff807a6c9054271de4
extra : amend_source : 852c64d14c75c7353c73468a5ee9bc6241c17c40
 2017-01-04 18:17:29 +01:00
Benjamin Bouvier
7901fac114 Bug 1328127: Fold br_table with all-same-successors into a goto in wasm; r=luke 
MozReview-Commit-ID: 7DDNWYXKzSv

--HG--
extra : rebase_source : 7f84c6761bea7848bde119d1767ca0c56dba7c84
 2017-01-04 18:20:07 +01:00
Hannes Verschore
b323594e9b Bug 1326213 - IonMonkey: Don't abort when trying to speculate on unstable proto, r=jandem 2017-01-05 10:25:15 +01:00
Hannes Verschore
17dcdf9c2c Bug 1328228: IonMonkey - Add extra help information trackopts in IONFLAGS, r=jandem 2017-01-05 10:22:17 +01:00
Hannes Verschore
642bdf9008 Bug 1328148: IonMonkey - Use MConcat for more cases, r=jandem 2017-01-05 10:22:16 +01:00
Hannes Verschore
54c8c2b1da Bug 1328252 - IonMonkey: Always unbox NewArray/NewObject cached optimizations, r=jandem 2017-01-05 10:22:15 +01:00
Tooru Fujisawa
00069dd84f Bug 1325606 - Return wrapped async function from caller property. r=jwalden 2017-01-05 17:09:23 +09:00
André Bargull
4956d8f41a Bug 1326453 - Part 5: Remove no longer used ListIterator implementation. r=jonco 2016-12-30 15:12:19 -08:00
André Bargull
385e5cfa47 Bug 1326453 - Part 4: Return @@toStringTag in [[OwnPropertyKeys]] trap for module namespace objects. r=jonco 2016-12-30 14:31:54 -08:00
André Bargull
eef3e8d274 Bug 1326453 - Part 3: Don't throw a TypeError when SetPrototypeOf for module namespace objects is called with null. r=jonco 2016-12-30 14:28:34 -08:00
André Bargull
575fe960af Bug 1326453 - Part 2: Change @@toStringTag for module namespace objects to non-configurable. r=jonco 2016-12-30 14:26:04 -08:00
André Bargull
b80d6e75d0 Bug 1326453 - Part 1: Remove @@iterator method from module namespace objects per ES2017. r=jonco 2016-12-30 14:24:48 -08:00
Daniel Näslund
6fdff8030c Bug 1316803 part 2 - optimize division for constant rhs. r=lth 2016-12-19 19:19:30 +01:00
Jeff Walden
2f327299fb Bug 1326454 - Add assertions to TokenStream::skipChars{,IgnoreEOL} verifying EOF isn't yet hit and that newlines aren't skipped, if appropriate. r=arai 
--HG--
extra : rebase_source : d1e6ca3d465111d87f4e6d1ecdbdd011944b2500
 2016-11-29 13:35:46 -08:00
Jeff Walden
306c6680e3 Bug 1326454 - Make TokenStream::skipChars{,IgnoreEOL} accept an unsigned integral number of chars to skip. r=arai 
--HG--
extra : rebase_source : 1f823c6dbcd018372e7f4f3b6ee8612a22773cb8
 2016-11-29 13:35:46 -08:00
Jeff Walden
f43d28abed Bug 1326454 - Make TokenStream::peekChar's signature fallible. r=arai 
--HG--
extra : rebase_source : 30df9da521a9c139619b2e6f0f9f2a30d76f83b3
 2016-11-22 12:32:44 -08:00
Jeff Walden
63a91f32ac Bug 1326454 - Rename TokenStream::getBracedUnicode to TokenStream::matchBracedUnicode and make its signature fallible. r=arai 
--HG--
extra : rebase_source : 18eedfc991915a241132960cf42efece21330a7f
 2016-11-29 13:35:46 -08:00
Jeff Walden
5279da4162 Bug 1326454 - Introduce TokenStream::warning that warns at the current offset. r=arai 
--HG--
extra : rebase_source : 74f4f3d40726d93b5deaf41c827a0e9965ba1e50
 2016-11-22 12:32:44 -08:00
Jeff Walden
baab0350fb Bug 1326454 - Introduce TokenStream::error that reports an error at the current offset. r=arai 
--HG--
extra : rebase_source : 26c3db7d5021706cb29c97f93b79ad5385fd2d15
 2016-11-22 12:32:44 -08:00
Jeff Walden
b1f099c68c Bug 1285960. r=sfink 
--HG--
extra : rebase_source : 51edd4dca40eceb83bb70dea0bf870176ec4c7f9
 2016-12-16 15:35:03 -05:00
Shu-yu Guo
8701148872 Bug 1319443 - Fix GlobalScopes XDR to encode global function bindings. (r=Waldo) 2017-01-04 15:15:00 -08:00
Tom Schuster
d08f86527e Bug 1328077 - Attach dense element hole IC even with zero dense elements. r=jandem,bhackett 2017-01-04 22:12:05 +01:00
Emanuel Hoogeveen
f3e78de716 Bug 1328355 - Don't unintentionally crash from the exception handler on Windows. r=jandem 2017-01-03 11:49:00 -05:00
Benjamin Bouvier
d43de884f1 Bug 1328151: Check for OOM in BinaryToAST initialization of result; r=luke 
MozReview-Commit-ID: 3tnx4rS6rZc

--HG--
extra : amend_source : d3d4a59b4df0d4e4bb0a7eed171d33cea8c74973
 2017-01-03 16:18:03 +01:00
Jessica Jong
4f5f57be29 Bug 1310078 - Implement valueAsNumber and valueAsDate for <input type=datetime-local>. r=smaug,Waldo 2017-01-03 22:33:00 +01:00
Tom Schuster
e5006909b7 Bug 1328076 - Attach primitive IC for more properties. r=jandem 2017-01-04 12:07:58 +01:00
Tom Schuster
ee102bc0e9 Bug 1323190 - Remove Proxy friendapi. r=arai 2017-01-04 12:07:58 +01:00
Olli Pettay
d4f2be7cde Bug 1326507, rename Traverse to TraverseNative, r=mccr8 
--HG--
extra : rebase_source : cb10292c2b9685855a6027a0377d10f168bbcbf6
 2017-01-03 21:50:10 +02:00
Olli Pettay
0364dbc792 Bug 1326507, remove NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS, r=mccr8 
--HG--
extra : rebase_source : 3ae1207308de120b7299b13ecaa95dd1612b3459
 2017-01-03 21:47:55 +02:00
Tom Schuster
35cc48627d Bug 1317422 - Keep nicer code in JS_ResolveStandardClass. rs=Waldo 2017-01-04 00:26:49 +01:00
Tom Schuster
8c3f8e39a9 Bug 1317422 - Backout the global property propsal. r=Waldo 2017-01-04 00:26:49 +01:00
Emanuel Hoogeveen
e5801be263 Bug 1328222 - Ensure that the exception handler thread on OSX is terminated before we quit. r=jandem 2017-01-03 02:14:00 +01:00
Emanuel Hoogeveen
4e17150ba2 Bug 1326302 - Part 4: Guard against reentrancy when patching jumps as well. 2017-01-02 14:50:00 +01:00
Emanuel Hoogeveen
c6fb012f0a Bug 1326302 - Part 3: Guard against reentrancy in PageProtectingVector. r=jandem 2017-01-02 13:12:00 +01:00
Emanuel Hoogeveen
a7d77c812f Bug 1326302 - Part 2: Expose the ability to fully or partially disable protection and use it for WASM. r=jandem r=luke 2017-01-02 13:11:00 +01:00
Emanuel Hoogeveen
962851c95d Bug 1326302 - Part 1: Redesign PageProtectingVector for minimum overhead. r=jandem 2017-01-02 13:11:00 +01:00
Tom Schuster
2a8b766af3 Bug 1323190 - Attach Proxy GetElem IC. r=jandem 2017-01-03 13:09:58 +01:00
Tom Schuster
4a85614b87 Bug 1326589 - Correct CacheIR issue with uninitialized let and GetGName. r=jandem 2017-01-01 15:12:17 +01:00
Tooru Fujisawa
d12ec9badf Bug 1320408 - Part 7: Remove JSContext* parameter from JSObject::shouldSplicePrototype. r=jandem 2016-12-31 16:03:02 +09:00
Tooru Fujisawa
682e9b2d8b Bug 1320408 - Part 6: Change JSObject::splicePrototype to static method. r=jandem 2016-12-31 16:03:02 +09:00
Tooru Fujisawa
3d774fe97b Bug 1320408 - Part 5: Change JSObject::constructorDisplayAtom to static method. r=jandem 2016-12-31 16:03:01 +09:00
Tooru Fujisawa
d25e809b11 Bug 1320408 - Part 4: Change JSObject::getGroup to static method. r=jandem 2016-12-31 16:03:01 +09:00
Tom Schuster
8684b280b7 Bug 1325938 - Unify window handling across ICs. r=jandem 2016-12-30 21:43:37 +01:00
Luke Wagner
d69a4426a7 Bug 1326280 - Baldr: use .wasm as bytecode file format (r=bbouvier) 
MozReview-Commit-ID: 5nmuLDswfWU

--HG--
extra : rebase_source : eb0839326f65c58bd51521bc6bcdca9a4cec846a
 2016-12-30 10:49:54 -06:00
Tom Schuster
33ee1e8b6a Bug 1324566 - Inspector support for GlobalNameGetter. r=jandem 2016-12-30 17:38:08 +01:00
Tom Schuster
d771af8608 Bug 1324566 - Port Baseline GlobalNameAccessor to CacheIR. r=jandem 2016-12-30 17:38:08 +01:00
Benjamin Bouvier
ec79f44e1f Bug 1320374: Batch function compilations; r=luke 
MozReview-Commit-ID: BmFx1UuesSL

--HG--
extra : rebase_source : c43ae49d7cb048ec06b0c592894b8361758d7543
 2016-12-27 15:48:46 +01:00
Jan de Mooij
48076d30a7 Bug 1326150 - Don't attach getter stubs to IonGetPropertyIC if the IC result isn't monitored. r=h4writer 2016-12-30 14:29:35 +01:00
Jan de Mooij
3638a0143a Bug 1188586 - Add testcase. r=me 2016-12-30 14:29:32 +01:00
Benjamin Bouvier
963bd86937 Bug 1326027: include SSE2 flags in autospider; r=sfink 
MozReview-Commit-ID: KWDBsmU798J

--HG--
extra : rebase_source : 3c7ce36f9ecaab0dd70b4ddcc1e9715e1ee8b8c9
extra : histedit_source : 42cced527e07d09a90994a19188bb812803003f3
 2016-12-29 10:31:38 +01:00
Benjamin Bouvier
73ec7c660f Bug 1326027: Remove RawF32 and RawF64; r=luke 
MozReview-Commit-ID: ArjweiIrq0j

--HG--
extra : rebase_source : bfd12340181f8e7f475164e33a076c687e5d8c8c
extra : histedit_source : 8c3691d4fc5fea29fa71130655bce79d6fc7e087%2Ce1b529902b4474cc0a0eb56b465a1fcb8a1eefd8
 2016-12-30 10:35:47 +01:00
Benjamin Bouvier
84f0acd454 Bug 1326179: wasm: Disable parallel compilation on machines with 1 CPU; r=luke 
MozReview-Commit-ID: EEGWa2u9U2X

--HG--
extra : rebase_source : b953c4c87bc2702929c474a55082781ff65201e3
extra : amend_source : aef6268c43ef4e2d9452315d459094779cd465c1
 2016-12-29 11:47:33 +01:00
Jeff Walden
7e29e33ae3 Bug 1285833 - Update code comments to latest spec steps. r=sfink 2016-12-06 17:21:05 -10:00
Jeff Walden
1517b40e82 Bug 1325675 - Followup bustage fix for a newly-landed test that needs an update along the same lines as the others this bug just touched. r=sparky 2016-12-29 18:30:59 -06:00
Jeff Walden
d090fc1e7c Bug 1325459 - Expose the PluralRules constructor only by explicit action,, for now. r=anba 
--HG--
extra : rebase_source : a14878e0281d3ab1302451e41e18e4b9d5b8f5cf
 2016-12-28 15:25:27 -06:00
Jeff Walden
d8c066294a Bug 1325674 - Update variable names in InitializeNumberFormat to latest spec, for readability. r=anba 
--HG--
extra : rebase_source : 5d5ffb813dc385aa464bfbde5332fb2143bfa521
 2016-12-28 15:15:01 -06:00
Jeff Walden
a96f0e6d35 Bug 1325157 - Implement a ParserBase class that holds functionality that's identical between syntax parsing and full parsing. r=arai 
--HG--
extra : rebase_source : 0cb984199d57d040c52f05dd3e856329fc8a3095
 2016-12-28 14:56:51 -06:00
Jeff Walden
86d91d1baa Bug 1296814 - Rename TokenStream::reportStrictWarningErrorNumberVA to TokenStream::reportExtraWarningErrorNumberVA for clarity. r=arai 
--HG--
extra : rebase_source : db112e454fd7c4c1b3b37d2090ee80585f53be64
 2016-12-09 11:16:49 -10:00
Jeff Walden
af5cee34f2 Bug 1296814 - Remove Parser::reportHelper. r=arai 
--HG--
extra : rebase_source : b9d6576ecdf7edbf7e290c81f4c0996d5adf9d0b
 2016-12-09 11:15:09 -10:00
Jeff Walden
2c2be20d6b Bug 1296814 - Inline Parser::reportHelper into its callers. r=arai 
--HG--
extra : rebase_source : 8da3a61cf898d10278b7e7ac639ce3c140a4b1b5
 2016-11-22 12:32:44 -08:00
Boris Zbarsky
bc6e0e2c1f Bug 1326096 yet another followup. Silence the opinionated spidermonkey include style checker on CLOSED TREE 2016-12-29 14:38:29 -08:00
Boris Zbarsky
ed2c1ef6c3 Bug 1326096 another followup: fix build bustage on CLOSED TREE. 2016-12-29 14:24:47 -08:00
Boris Zbarsky
ac198725dc Bug 1326096 followup. Suppress the false-positive GC analysis failure due to us doing an indirect call that the static analysis doesn't understand. r=sfink 2016-12-29 14:00:43 -08:00
Boris Zbarsky
6600d3cc90 Bug 1326096 part 2. If there is an external string memory runtime callback, call it from memory reporting code. r=waldo 2016-12-29 13:19:26 -08:00
Boris Zbarsky
5bc2ae127e Bug 1326096 part 1. Add a way to set an external string memory runtime callback. r=waldo 2016-12-29 13:19:26 -08:00
Wes Kocher
2045ef4aab Merge m-c to inbound, a=merge 
MozReview-Commit-ID: ESXuJFW2Tgr
 2016-12-29 12:08:05 -08:00
Wes Kocher
0747771468 Merge inbound to central, a=merge 
MozReview-Commit-ID: 1rhhMOnW569
 2016-12-29 12:03:47 -08:00
Jan de Mooij
8111c1817e Bug 1323096 - Optimize object[double] and object[string] like object[int32]. r=evilpie 
--HG--
extra : rebase_source : ea0a37bdc41a0dc20e1b3816aec57b9b0752b11c
 2016-12-29 15:22:44 +01:00