Commit Graph

17555 Commits

Author SHA1 Message Date
Jason Duell
def5c3a081 Bug 695635: Unprefix websockets. r=sicking, sr=smaug
--HG--
rename : content/base/public/nsIMozWebSocket.idl => content/base/public/nsIWebSocket.idl
2011-12-20 00:20:12 -08:00
Boris Zbarsky
1b8698e479 Bug 624621 part 3. Use the pre-redirect filename as the script filename and the channel principal as the origin principal, and base our cross-origin check on the origin principal. r=mrbkap 2011-12-19 12:48:12 -05:00
Ben Turner
6e927f2bff Bug 712448 - 'Slim wrappers do not use deferred release mechanism'. r=mrbkap. 2011-12-20 17:42:51 -05:00
Chris Leary
0371422967 Bug 712169: Make aligned/unaligned LifoAlloc consistent. (r=luke)
--HG--
extra : rebase_source : cff51d01e46f5b09d642368da532b9b6a8649053
2011-12-20 14:19:45 -08:00
Michael Wu
37d2a6827a Bug 701662 - Serialize filenames in JS_XDRFunctionObject, r=igor 2011-12-20 11:31:45 -08:00
Tom Schuster
1f4f431168 Bug 708819 - Avoid recursion through Error.prototype.toString/toSource r=luke
--HG--
extra : rebase_source : 7e6437b497886bbd8109a6c8a392923fff537c84
2011-12-19 14:17:00 +01:00
Tom Schuster
46fa50e1b0 Bug 708695 - Fix issues found by clang's scan-build. r=Waldo
--HG--
extra : rebase_source : 5b1970539b2f5b211ebeb97765d8c549371cb888
2011-12-19 14:16:53 +01:00
Marco Bonardo
c3c5c549d4 Merge last green PGO changeset from mozilla-inbound to mozilla-central 2011-12-19 12:47:41 +01:00
Phil Ringnalda
be45030cc0 Bug 695345 - Bring back ISO8601DateUtils.jsm, a=akeybl 2011-12-18 18:50:13 -08:00
Matt Brubeck
ac7dca5992 Merge mozilla-central to mozilla-inbound 2011-12-18 08:22:53 -08:00
Ms2ger
161d20a31f Bug 708754 - Use IDL for jsdIDebuggerService::WrapValue and remove WrapJSValue; r=bholley 2011-12-18 11:12:26 +01:00
Ms2ger
fecfdf8492 Bug 708330 - Use IDL for Components.utils.getWeakReference; r=bholley 2011-12-18 11:11:56 +01:00
Ms2ger
07b93b8f80 Bug 708326 - Use IDL for Components.utils.forceGC; r=bholley 2011-12-18 11:11:23 +01:00
Ms2ger
39999e4c63 Bug 708253 - Use IDL for Components.(utils.)reportError; r=bholley 2011-12-18 11:10:59 +01:00
Ms2ger
4216d5a258 Bug 705324 - Remove nsAXPCNativeCallContext::{GetRetValPtr,GetReturnValueWasSet,SetReturnValueWasSet}; r=bholley sr=bz 2011-12-18 11:09:58 +01:00
Ms2ger
f96b5a8d5b Bug 705355 - Use IDL for Components.utils.evalInSandbox; r=bholley 2011-12-18 11:09:56 +01:00
Ms2ger
edaf8cc36e Bug 705188 - Use IDL for mozIJSSubScriptLoader::LoadSubScript, {xpcIJSModuleLoader,nsIXPCComponents_Utils}::Import; r=bz 2011-12-18 11:09:16 +01:00
Ms2ger
e1d2a8071f Bug 705344 - Use IDL for Components.(utils.)lookupMethod; r=bholley 2011-12-18 11:08:04 +01:00
Ms2ger
5741fb5bb9 Bug 705444 - Use IDL for jsdIValue::GetWrappedValue; r=bholley 2011-12-18 11:07:22 +01:00
Ms2ger
6464cec1ae No bug - Remove unused JS::Value::setObjectOrUndefined; r=luke 2011-12-18 11:06:43 +01:00
Ms2ger
c480d4db80 Bug 707576 - Remove nsIDOMNSElement; r=smaug 2011-12-18 11:06:23 +01:00
Jeff Walden
95c80127e7 Bug 711775 - Implement MOZ_NORETURN to encapsulate this-function-doesn't-return semantics. r=cjones
--HG--
extra : rebase_source : d56f3ef47e11c42b5fe6a442e13fd6202208914f
2011-12-17 16:45:29 -05:00
Andrew McCreight
b8401845bd Bug 711616 - QI wrapped native weak map keys to nsINode. r=jst 2011-12-17 22:11:04 -08:00
John Schoenick
34b5116fdd Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst 2011-12-16 11:08:59 -08:00
Jeff Walden
6bb9efafe4 Bug 711672 - Break mfbt's dependency on jstypes.h by moving various API macros out of JS and into mfbt. r=luke, r=cjones
--HG--
extra : rebase_source : f18993e1eec1a5e5bcdb9cd97fa7d7c6ad261e2c
2011-12-13 14:26:58 -05:00
Phil Ringnalda
a30061699c Back out 316d6a49a603 and 98617f7b667b (bug 624621) for jsreftest failures 2011-12-19 18:40:16 -08:00
Boris Zbarsky
9e927dd338 Bug 624621 part 3. Use the pre-redirect filename as the script filename and the channel principal as the origin principal, and base our cross-origin check on the origin principal. r=mrbkap 2011-12-19 12:48:12 -05:00
Igor Bukanov
d3409cbe70 bug 711623 - rt->gcNumFreeArenas is not updated properly. r=terrence
--HG--
extra : rebase_source : 5abd5e5c3ce789e912aa63ef21001d70893912b7
2011-12-19 23:07:24 +01:00
Andrew McCreight
70623bf5d3 Bug 710492 - add special cycle collector shape tracing path. r=bhackett 2011-12-19 10:24:56 -08:00
Nicholas Nethercote
41607c5826 Bug 709653 - Fix GC heap memory reporters. r=bhackett.
--HG--
extra : rebase_source : 6805671750bd6a9e9661e70832a3837d4064f6ea
2011-12-11 21:21:18 -08:00
Nicholas Nethercote
2fa63e0548 Bug 707865 - Convert nsTArray::SizeOf() to nsTArray::SizeOfExcludingThis(). r=jlebar.
--HG--
extra : rebase_source : d802d58bc7dedda2490878793923adc0ab55f779
2011-12-15 14:59:53 -08:00
Jeff Walden
24ef5dcc5b Bug 711672 - Remove DEFINE_LOCAL_CLASS_OF_STATIC_FUNCTION as it's unused. r=luke 2011-12-13 14:26:57 -05:00
Jeff Walden
b2d881279f Bug 711799 - Fix a bunch of initializing-pointer-from-boolean warnings. r=dholbert
--HG--
extra : rebase_source : 4a5d03b10ad8ac4eaff222037ba3400a26e7cf55
2011-12-18 01:00:47 -05:00
Jeff Walden
2342bcbe77 Add MOZ_OVERRIDE to CrossOriginWrapper functions. No bug (but sort of r=luke from bug 708735 :-) )
--HG--
extra : rebase_source : d0bdbc8c031457a3a9f7f8cc82d141e0d83883f4
2011-12-15 14:32:25 -05:00
Ralph Giles
1ea8cea5fd Bug 697881 - Fall back to gcc on darwin if there's no gcc-4.2. r=ted
Since Bug 513353, we've defaulted to gcc-4.2 on darwin.
Unfortunately the default was unconditional, and while
XCode 4.1 provided a gcc-4.2 alias, XCode 4.2 does not,
although 'gcc' is llvm-gcc 4.2.1. As such, the configure
script immediately fails.

The patch still prefers gcc-4.2, but falls back to plain
gcc if it's not available.

Note that we try $CC and $CXX from the environment first
so it is still possible to override this default.
2011-12-18 20:20:28 +01:00
aceman
c475fda161 Bug 122213 - Display time and date of messages in toolkit's Error Console. r=neil sr=bz 2011-12-17 05:22:26 +01:00
Jeff Walden
52e1a4c28f Bug 711611 - NSPR's obsolete int32, int64, etc. types get defined without an opt-out #define -- add that #define to SpiderMonkey so int32/etc. can't be (mis-)used. r=bhackett
--HG--
extra : rebase_source : 18c73b832cb9f4587c4a1114f237edcaba657199
2011-12-16 17:03:07 -05:00
Bobby Holley
c5d0be548b Bug 711288 - Unconditionally use the new value of JSPROP_READONLY in accessor -> data transformations. r=Waldo 2011-12-16 14:32:39 -08:00
Bill McCloskey
45769c3f0c Bug 710947 - Allow hash table elements to be removed during GC (r=luke) 2011-12-16 14:01:44 -08:00
Brian Hackett
18192c5284 Fix lingering uses of int32 types, no bug. 2011-12-16 13:21:02 -08:00
Doug Sherk
797ba840ff Bug 708207: implement WebGL's getShaderPrecisionFormat r=bjacob 2011-12-16 13:11:59 -08:00
Brian Hackett
3983e0f31e Add interface for accessing PC counter information from chrome code, bug 687134. r=sfink,waldo 2011-12-16 13:11:08 -08:00
Ms2ger
b6f42e130c Backed out changeset ba447ace2594 (bug 687679) for bustage. 2011-12-16 21:17:16 +01:00
John Schoenick
d2b02fa02e Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst 2011-12-16 11:08:59 -08:00
Bill McCloskey
d39ab52638 Bug 711158 - Avoid triggering write barrier during verifier (r=luke) 2011-12-16 10:31:56 -08:00
Jeff Walden
a7d6a6d6e8 Bug 708735 - Really remove the uint32/JSUint32 typedefs now that all users have been fully corrected. r=luke, r=dmandelin from the original change, landing in a CLOSED TREE (which can open now!) 2011-12-16 10:00:08 -05:00
Jeff Walden
369c8705b9 Backed out changeset f879c54dffae: 5efcb9c3b375 introduced more JSAPI users that need fixing for the <stdint.h> types, and it's not worth trying to do fixups for that commit now while holding the tree closed. uint32/JSUint32 type removals will occur later today, after I reopen up a CLOSED TREE. 2011-12-16 08:20:21 -05:00
Jeff Walden
c1e1e8864c Bug 708735 - Remove the non-<stdint.h> {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types from the JSAPI. The public header added in the previous commit with the old typedefs should ease migration for embedders. r=luke, r=dmandelin, pushing into a CLOSED TREE so the landing is smooth 2011-12-15 21:51:08 -05:00
Jeff Walden
476c7d19c5 Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin 2011-12-08 22:54:10 -05:00
Ed Morley
3691e9b488 Bug 710486 - Remove unnecessary mkdir objdir/js/src/nanojit; r=ted 2011-12-16 09:13:29 +00:00
Igor Bukanov
fe5b8abdac Backed out changeset cd1252510d17 - I landed the wrong patch for bug 711623 2011-12-18 00:14:37 +01:00
Igor Bukanov
3627aab971 bug 711623 - rt->gcNumFreeArenas is not updated properly. r=terrence 2011-12-17 23:16:22 +01:00
Jim Blandy
0f12451749 Bug 708156: Ensure that JM compilation doesn't used out-of-date ScriptAnalysis structures. r=bhackett 2011-12-15 18:08:00 -08:00
Terrence Cole
8eb45701fc Bug 710946 - Add write barriers to getterObj and setterObj; r=billm
These fields are immutable, so they do not necessarily need a barrier for
incremental collection -- they do, however, need a barrier for generational
collection, and for reliable verification of the barriers.  It would be nice to
make these HeapPtr's, rather than manually calling the barrier functions, but
the fields are unioned with a function pointer, so this is not trivial.

--HG--
extra : rebase_source : f1f33198317e28fef3cc777f3e1e84725ba9cdc5
2011-12-15 18:03:20 -08:00
Andrew McCreight
0797d76208 Bug 680937, part 3 - implement and set preserve wrapper callback. r=jst 2011-12-15 17:45:49 -08:00
Andrew McCreight
541dcff9f2 Bug 680937, part 2 - Add native wrapper preservation hook, call it in WeakMap_set. r=billm 2011-12-15 17:45:21 -08:00
Andrew McCreight
bdf4ad1f26 Bug 680937, part 1 - Don't always mark wrapped native keys. r=billm 2011-12-15 17:44:34 -08:00
Terrence Cole
6191221385 Bug 711266 - JSRope::flatten needs unconditional post barriers; r=billm
For incremental barriers we check if compartment()->needsBarrier to defer the
cost when we are not in a GC cycle.  We cannot do this for cross-generation
barriers.  We need to remove the checks on the post barriers and rename the enum
to something  more specific.
2011-12-15 17:34:59 -08:00
Terrence Cole
8052b64a6e Bug 710950 - JSScript::function_ should be barriered; r=billm
The field is immutable, so we can return an unwrapped pointer and don't have to
worry about it for incremental barriers.  We do need post barriers on it during
init for detecting cross-generation pointers, however.  Just make it a normal
HeapPtr.

--HG--
extra : rebase_source : a52d3d74ab5bf3ae926b9da5212825ce1c0ae93d
2011-12-15 15:27:58 -08:00
Felix Fung
14c8124b0a Bug 710996 - Double-assignment in JS_GetValidFrameCalleeObject(). r=jorendorff 2011-12-15 00:28:11 -08:00
Igor Bukanov
908fd20e0d bug 711095] - make GC scanning compatible with the incremental GC. r=billm
--HG--
extra : rebase_source : 5328784491f322824977ba80dd302cc13e84520a
2011-12-15 21:07:45 +01:00
Igor Bukanov
eee1ff8508 bug 710581 - fixing GCC 4.6 warning. r=bhackett
--HG--
extra : rebase_source : ae76549e73945844a75c1d518682b5db4af4cd1a
2011-12-14 20:51:56 +01:00
Terrence Cole
073e795eed Bug 711165 - DenseArray are missing some barrier calls; r=billm
The copy path was caught, the init path was not.  This does not matter for
incremental barriers, but will for cross-generation barriers.

--HG--
extra : rebase_source : 4fa7c4cc860cd9265ccd598340941840ee4e23e9
2011-12-15 15:27:32 -08:00
Brian Hackett
3df3c83b7c Correctly compute fun.caller for cloned functions, bug 710780. r=luke 2011-12-15 14:09:49 -08:00
David Mandelin
c4568252b9 No bug, remove file needed only for nanojit landings 2011-12-15 14:07:59 -08:00
Chris Leary
0afa159f1a Bug 709622: Conditional with empty consequent causes strict strict warning. (r=Waldo) 2011-12-13 13:22:37 -08:00
Bobby Holley
9440548e3f Bug 711203 - enable XPConnect wstring test. r=khuey 2011-12-15 13:27:42 -08:00
Luke Wagner
80d107697c Bug 703645 - rm SRC_LOOPHEAD (r=waldo)
--HG--
extra : rebase_source : 9301aa0af4e81a8725f05c702145c89a4ece4db6
2011-11-22 11:37:57 -08:00
Luke Wagner
83117ca3ba Bug 704478 - Fix single-threaded runtime assertions in shell workers (r=jorendorff)
--HG--
extra : rebase_source : 13deb300ee2aa3d5518549d4f296b276a0da4e42
2011-11-22 11:37:57 -08:00
Luke Wagner
17636ec3af Bug 704351 - Fix ValueToScript in js shell (r=waldo)
--HG--
extra : rebase_source : 0c072081ed9699017ddae80404c24562c6de3536
2011-11-22 11:37:57 -08:00
Luke Wagner
e77e503d98 Bug 705879 - Avoid touching stale generator frame in js_CloneBlockObject (r=bhackett)
--HG--
extra : rebase_source : be217f5a36fb69c37fe09e41f34b7f031a3e8224
2011-12-07 17:14:35 -08:00
Luke Wagner
a5fc0b3da5 Bug 624621 - Allow embeddings to attach an extra 'origin' principal to scripts (r=mrbkap)
--HG--
extra : rebase_source : 85ed15c9f230bc342e7810e62abace18a7177c4b
2011-06-27 17:42:53 -07:00
Bobby Holley
ad05f2e304 Bug 702491 - Don't set JSPROP_READONLY for accessor properties. r=Waldo 2011-12-15 11:40:57 -08:00
Bill McCloskey
bc4234efe8 Bug 708303 - Back out 1deb23332fb5 for orange 2011-12-15 10:30:09 -08:00
Jeff Walden
c37a119a72 Bug 709322 - Create break/continue statements using constructors that don't examine the token stream. r=jorendorff
--HG--
extra : rebase_source : a243448ec54ace56b108cd0fa548e36a6d539603
2011-12-09 20:26:07 -05:00
Jeff Walden
a0377b75a9 Bug 710192 - JSOP_SETPROP does not imply the property name isn't an index. r=evilpies
--HG--
extra : rebase_source : 7e284895ce88aa47c2f9f009aa3e0614161c35ea
2011-12-13 15:53:29 -05:00
Bill McCloskey
c1d005dc3f Bug 708805 - Add write barrier to JSFunction::env (r=bhackett) 2011-12-15 09:41:04 -08:00
Bill McCloskey
e347431766 Bug 708303 - Use pinReg/unpinReg more in write barriers (r=dmandelin) 2011-12-15 09:40:59 -08:00
Bill McCloskey
f0e9a0107f Bug 708228 - Fix infinite write barrier recursion in regexp purge (r=cdleary) 2011-12-15 09:40:51 -08:00
Brian Hackett
b9a0fd7215 Watch for native functions when cloning methods accessed by fun.caller, bug 709634. r=luke 2011-12-15 09:17:11 -08:00
Brian Hackett
ba149c3e2a Backout 36fa9b176a91 (bug 710516) for M1 bustage. 2011-12-15 09:07:00 -08:00
Brian Hackett
3a8434d343 Watch for GCs under nativeLookup, bug 709863. r=dvander 2011-12-15 09:01:00 -08:00
Brian Hackett
c12c6c99d0 Properly watch for indexed prototypes and configured properties in array prototype, bug 709067. r=luke 2011-12-15 08:51:09 -08:00
Brian Hackett
1890d76417 Remove JSObject::containsSlot, bug 710516. r=luke 2011-12-15 08:06:00 -08:00
Nathan Froyd
525cb490bb Bug 560349 - make PodZero use inline loops rather than memset; r=luke 2011-12-08 19:59:08 -05:00
Mike Hommey
897722e75d Bug 709721 - Move video and audio libraries in a gkmedias library on Windows. r=khuey 2011-12-15 06:40:20 +01:00
Jeff Walden
896dcba95d Silence unused-value warnings with various Valgrind macros in clang, and add a silencing instance to jsgc.cpp. No bug, rs=jorendorff, a=philor 2011-12-13 17:31:08 -05:00
Andrew McCreight
5ee90597ab Bug 709162 - crash test for cycle collector dumping. rs=bholley a=mbrubeck 2011-12-14 16:02:12 -08:00
Andrew McCreight
b384695ef1 Bug 710761 - test if CC listener begin fails, don't call listener again. rs=bholley 2011-12-14 15:56:37 -08:00
Andrew McCreight
9ecfbe34d7 Bug 709160 - fix ObjShrink fallout in nsXPConnect::Traverse CC printing code. r=luke 2011-12-14 15:56:37 -08:00
Igor Bukanov
1a10f86b5f bug 708548 - removal unused declarations and definitions of *OnTrace functions. r=dvander a=khuey-on-irc
--HG--
extra : rebase_source : ea767043f6af276c5cdfeb0301491fc89b49c931
2011-12-08 10:29:21 +01:00
Tom Schuster
0138dca053 Bug 590036 - Optimize cases where we probably eval an array, that would be parsable by JSON. r=jorendorff a=SpiderMonkey 2011-12-13 18:24:10 +01:00
Tom Schuster
211f7a7fb7 Bug 706924 - Rename JSOP_PUSH to JSOP_UNDEFINED, and remove dead code from the decompiler. r=Waldo a=SpiderMonkey 2011-12-13 18:23:37 +01:00
Andrew Quartey
e51c16190c Bug 706010 - Remove NS_SPECIALIZE_TEMPLATE and HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX; r=khuey a=cleanup/removal 2011-12-13 14:17:59 +00:00
Nicolas Pierron
43f76d1e21 Bug 700517 - Add "ret imm16" instruction for x86 and x86_64; r=dvander a=not-libxul 2011-12-13 14:17:57 +00:00
Igor Bukanov
7defa0e7fa Bug 708382 - GC marking - one common stack and tail recurssion elimination. r=wmccloskey. a=ms2geronirc
--HG--
extra : rebase_source : 580b30f289f4e1b1a1980bb000fc25e6e3cf27e7
2011-12-07 14:22:47 +01:00
Igor Bukanov
d4fb81a314 Bug 708382 - GC marking - merging string and object stacks. r=wmccloskey
--HG--
extra : rebase_source : ca47672218af276ed0bbdfd53add6207c524179b
2011-12-08 10:29:43 +01:00
Ms2ger
865e9eff78 Bug 709603 - Remove unused variables 'type' in CallMethodHelper::Get{ArraySize,InterfaceType}FromParam; r=bholley a=ehsan 2011-12-13 09:49:31 +11:00
Justin Lebar
e492c4de05 Bug 696535 - Use absolute paths in pythonpath.py. r=bsmedberg a=test-only 2011-12-12 15:44:41 -05:00
Jim Blandy
e954692870 No bug: Bring jorendb up to date with current state of Debugger object. r=NPOB,jorendorff 2011-12-09 14:12:36 -08:00
Nicholas Nethercote
2a7afd1ec3 Bug 705987 - Use mallocSizeOf in the layout memory reporters. r=khuey,bzbarsky 2011-12-08 21:01:52 -08:00
Ed Morley
eed3b8a0a7 Backout ee420d0f03df (bug 697479) for Win opt build failures 2011-12-09 09:30:25 +00:00
Jason Orendorff
e0ae2a9e78 [revised per backout affc2782a250, jimb] Implement simple Map and Set builtins for JS. Bug 697479, r=jimb. 2011-12-08 21:04:10 -08:00
Brian Hackett
3298551d83 Ensure consistent warnings when accessing undefined names, bug 706240. r=waldo 2011-12-08 19:50:09 -08:00
Brian Hackett
aebe1b08d1 Avoid sharing owned base shapes between multiple shapes, bug 707842. r=luke 2011-12-08 19:37:17 -08:00
Christian Holler
3864a45f80 Ensure a consistent enumeration order when compiled in deterministic mode, bug 707017. r=luke 2011-12-08 19:28:36 -08:00
Brian Hackett
2c5ff8c206 Refine shape changes done to preserve teleporting invariant on prototype changes, bug 707515. r=luke 2011-12-08 19:23:31 -08:00
Rafael Ávila de Espíndola
e0e8413832 Bug 708851 - Any gcc that supports firefox support -pipe. 2011-12-08 22:16:06 -05:00
Nicholas Nethercote
5ec7ee41ae Bug 704400 - Implement --enable-dmd. r=khuey. 2011-12-08 19:09:36 -08:00
David Anderson
c552bd7c52 Cap objects to a saner memory limit (bug 705855, r=dmandelin).
--HG--
extra : rebase_source : 551bbcee86d617f3a55a0a3274083ae54af4b294
2011-12-08 17:46:39 -08:00
Ed Morley
2d2a1931b2 Backout edecc56b7c80 and ad8aee962832 (bug 697479) for check-jit-test failures 2011-12-09 01:47:42 +00:00
Jason Orendorff
658f81deb0 Add missing file and fix for bug 697479 (rev ad8aee962832 added failing tests). No bug#, r=orange.
--HG--
extra : rebase_source : b104347e7f77f0856cdf1e83b923dfab74f1c8d9
2011-12-08 19:05:52 -06:00
Chris Leary
7a0e7a895a Bug 708873: Write unescape to match spec w/minor optimization. (r=Waldo) 2011-12-08 16:30:56 -08:00
Jason Orendorff
ef15d0fa6d Credit where it's due. No bug#, rs=jimb on IRC. 2011-12-08 17:59:59 -06:00
Jason Orendorff
09f636c792 Implement simple Map and Set builtins for JS. Bug 697479, r=jimb. 2011-12-08 17:54:51 -06:00
Jason Orendorff
6ec53cbaee Remove all mentions of imacros from js/src. Bug 708836, r=sfink. 2011-12-08 16:17:55 -06:00
Jim Blandy
be2a34ce64 Bug 708838: Use findReferences instead of countHeap to make js1_8/extensions/regress-422269.js fail less randomly. r=jwalden
The SpiderMonkey test js/src/tests/js1_8/extensions/regress-422269.js fails
randomly, because it requires a certain object to be garbage-collected to
pass. With a conservative stack scanner, an object being retained is not
necessarily a bug, and in general, the engine makes no promises about which
objects it retains and which it doesn't.

The JavaScript shell's new findReferences function allows us to find all GC
edges referring to the object, and filter out ones we know to be benign.
This patch changes the test to use findReferences.
2011-12-08 14:51:35 -08:00
Rafael Ávila de Espíndola
7227f67d0a Bug 708065 - Fix configure check for -pipe. r=ted.
With the shell used on OS X, the test we were trying to compile was

#include <stdio.h>
int main() { printf("Hello World
"); exit(0); }

which fails.
2011-12-08 17:01:21 -05:00
Jason Orendorff
2c05767530 A first cut at Debugger.Environment. Bug 690558, r=jimb.
--HG--
extra : rebase_source : 3cafc4e635f11b3219285fdf6fad952c15765f96
2011-12-08 14:54:26 -06:00
Jason Orendorff
6d4a9937bf Remove the last comment referring to imacros. No bug#, no_r=me.
--HG--
extra : rebase_source : ec684275939472f47dd5faee69c3b4023483d6e2
2011-12-08 14:28:13 -06:00
Jason Orendorff
579d99f332 Fix JS_TraceChildren crash triggered by findReferences. Bug 708261, r=jimb.
--HG--
extra : rebase_source : 336ebf499834345d364955000977a952014ea2bb
2011-12-08 14:23:31 -06:00
Jason Orendorff
92b99889d2 Remove another dead local variable so JS can build without warnings on GCC. No bug#, no_r=me.
--HG--
extra : rebase_source : 6f76525855ffc9a8b02ba9770109b490b9bde7c3
2011-12-08 14:14:01 -06:00
David Mandelin
5c6f651bcf no bug, mark two slow tests as slow 2011-12-08 12:21:40 -08:00
Ed Morley
cdb3765666 Bug 643167 - js/src configure should build js-config with MAKE, not GMAKE (based on patch by Kyle Huey); r=ted
* Switches js-config generation to use $MAKE rather than $GMAKE, since using
  make.exe on pymake builds causes issues:
  "config/autoconf.mk:354: *** Windows-style srcdir being used with GNU make"
* Ensures $MAKE is defined for configure when using client.mk
* For standalone js builds client.mk won't be used, so sets $MAKE manually if it
  isn't already defined, to avoid bug 605133 comment 22.
2011-12-08 20:02:26 +00:00
Ed Morley
178855ca6d Bug 707593 - Clean up makefile generation in js/src configure; r=ted
* Adds the omitted js/src/analysis-tests/Makefile
* Adds conditionals to prevent makefiles being generated where they won't be used
2011-12-08 20:02:25 +00:00
David Mandelin
99b9937e01 no bug, fix warning in jsobj.h 2011-12-08 12:03:16 -08:00
David Mandelin
1adef23ad1 no bug, fix warning in jsscope.h 2011-12-08 12:02:29 -08:00
David Mandelin
d5033addd5 Bug 707341: remove VOUCH_DOES_NOT_REQUIRE_STACK, r=jorendorff 2011-12-07 17:49:10 -08:00
Bill McCloskey
60a6742def Bug 705332 - Re-enable printing filename in quiet builds (r=njn) 2011-12-08 10:14:06 -08:00
Brian Hackett
f2b33980fa Fix incorrect use of shape->slot() when clearing native objects, bug 708006. r=luke 2011-12-08 08:58:39 -08:00
Brian Hackett
4b14507876 Fix test when starting compilation of loops with unreachable backedges and traps at the head, bug 707384. r=dvander 2011-12-08 08:57:17 -08:00
Jeff Walden
461e38f5e8 Bug 704313 - Implement mozilla/StdInt.h. r=cjones
--HG--
extra : rebase_source : b221134fdfbde13a37a6ef621bba3ca183a46101
2011-11-22 17:42:57 -08:00
Jeff Walden
498c8c0db5 Bug 704313 - Import, unmodified, the Microsoft-compatible <stdint.h> implementation from the 'msinttypes' Google Code project, r26, into mfbt. r=gerv for license compatibility and the addition to toolkit/content/license.html, r=cjones for the code
--HG--
extra : rebase_source : 9e1105b916d15023a91ffcca8b26445bc1bd930d
2011-11-22 16:40:45 -08:00
Mike Hommey
9b0673934e Bug 695843 part 9 - Use FileLocations in the component manager. r=bsmedberg 2011-11-08 18:10:51 +01:00
Mike Hommey
96e4d7b9da Bug 695843 part 8 - Properly handle jar-in-jars when importing modules. r=mrbkap 2011-12-08 11:03:36 +01:00
Mike Hommey
a66aad179b Bug 695843 part 7 - Use the URI string as the key for the various mozJSComponentLoader hashtables. r=mrbkap 2011-11-08 18:08:49 +01:00
Mike Hommey
7d9003960a Bug 703531 - Fix ARMAssembler::getOp2RegScale on < ARMv5. r=cdleary 2011-12-08 09:13:12 +01:00
Nicholas Nethercote
547f1793b5 No bug. Remove last trace of removed 'lirasm' directory. r=dvander. 2011-12-07 18:52:07 -08:00
Brian Hackett
998e1208e3 Don't try to correlate scripts with functions in JSD interface, bug 707613. r=luke 2011-12-07 13:41:27 -08:00
Brian Hackett
4e750df483 Remove JSOP_TRAP, bug 707454. r=jorendorff 2011-12-07 13:15:48 -08:00
Bill McCloskey
59ffebfd64 Bug 707051 - Change MarkChildren for shapes (r=igor) 2011-12-07 09:52:16 -08:00
Bill McCloskey
d5a72b7f8e Bug 704795 - Fix setprop write barrier for non-objects (r=bhackett) 2011-12-07 09:39:40 -08:00
Jeff Walden
e51511685a Bug 707383 - Rename ValueTo{ECMA,}{Ui,I}nt32 so that To{Ui,I}nt32 is the ECMA spec method and NonstandardTo{Ui,I}nt32 is the non-standard JSAPI method functionality. r=luke 2011-12-05 17:10:02 -05:00
Jeff Walden
894d37708d Bug 707061 - Rename js_ValueToString to ToString. Also, consistent with ToObject, make ToString include an inline already-string fast path, and make ToStringSlow be an out-of-line slow path for the case where the value is not a string (asserting that this is the case). r=luke 2011-12-01 19:35:44 -08:00
Jeff Walden
c16d837e9a Kill the warnings. KILL THEM WITH FIRE. No bug, r=sparky 2011-12-06 11:58:37 -05:00
Igor Bukanov
3150828a8b bug 708231 - fix set-but-unused warnings reported by GCC 4.6 in jsexn.cpp. r=evilpies 2011-12-07 16:21:40 +01:00
Blake Kaplan
b25121961d Bug 708215 - Report errors from the safe JS context. r=bent 2011-12-07 18:12:20 +08:00
Josh Matthews
cb25455930 Bug 696450 - Add increment/decrement methods to PointerType jsctype objects. r=bobbyholley 2011-11-08 16:06:19 -05:00
David Mandelin
27ae7a604d Bug 706316: don't clobber pinned registers in ImmutableSync, r=dvander 2011-12-06 17:06:56 -08:00
David Mandelin
0209785fec Bug 702572: always clone function in DEFLOCALFUN, r=jorendorff 2011-12-06 16:27:41 -08:00
Brian Hackett
fda96f98c9 Properly model semantics of prototype setters or permanent properties when analyzing definite 'new' script properties, bug 706808. r=luke 2011-12-06 16:09:04 -08:00
Brian Hackett
207a8f80e8 Improve exception messages when an error occurs in the middle of a decomposed opcode, bug 706532. r=luke 2011-12-06 15:58:35 -08:00
Brian Hackett
c579a910f7 Properly record dependency on functions having lazy arguments, bug 707641. r=dvander 2011-12-06 14:56:48 -08:00
Bill McCloskey
7352868e44 Bug 707750 - Invoke write barrier for setDenseArrayInitializedLength (r=bhackett) 2011-12-06 14:27:50 -08:00
David Mandelin
477aab886f Bug 660437: Fix conversion of non-numeric types to typed array elements, r=luke
--HG--
extra : rebase_source : 6d4fe2723b173215fa1412ab5127cb993d46c1d8
2011-12-06 14:24:39 -08:00
Igor Bukanov
072afd2333 Bug 707664 - atoms compartment should beunlocked during OOM reporting. r=luke 2011-12-05 21:28:07 +01:00
Igor Bukanov
d5bca61dfd Bug 707130 - Fix GCC 4.6 warnings coming from callgrind macros. r=jorendorff 2011-12-04 23:59:30 +01:00
Chris Leary
2d56623ee9 Bug 704369: Factor unary emit. (r=Waldo) 2011-11-22 12:13:41 -08:00
Chris Leary
460f707092 Bug 704369: Move unary emit. (r=Waldo) 2011-11-22 12:10:21 -08:00
Chris Leary
0a23856abb Bug 704369: Factor array emit. (r=Waldo) 2011-11-22 12:04:57 -08:00
Chris Leary
2032a479d9 Bug 704369: Move array emit. (r=Waldo) 2011-11-22 12:03:16 -08:00
Chris Leary
365d5cb657 Bug 704369: Factor object emit. (r=Waldo) 2011-11-22 11:55:04 -08:00
Chris Leary
389713c2fb Bug 704369: Move object emit. (r=Waldo) 2011-11-22 11:52:51 -08:00
Chris Leary
7745f6225f Bug 704369: Factor conditional expr emit. (r=Waldo) 2011-11-22 11:46:18 -08:00
Chris Leary
0e654a6c18 Bug 704369: Move conditional expr emit. (r=Waldo) 2011-11-22 11:45:30 -08:00
Chris Leary
597c0688c7 Bug 704369: Move synthetic statements emit. (r=Waldo) 2011-11-22 11:42:27 -08:00
Chris Leary
bebfdafb67 Bug 704369: Factor label emit. (r=Waldo) 2011-11-22 11:32:41 -08:00
Chris Leary
259d94c08e Bug 704369: Move label emit. (r=Waldo) 2011-11-22 11:31:35 -08:00
Chris Leary
019a01edc6 Bug 704369: Factor inc/dec emit. (r=Waldo) 2011-11-22 11:28:39 -08:00
Chris Leary
50972c49bb Bug 704369: Move inc/dec emit. (r=Waldo) 2011-11-22 11:26:47 -08:00
Chris Leary
2c5efb6b54 Bug 704369: Factor logical emit. (r=Waldo) 2011-11-22 11:23:52 -08:00
Chris Leary
203e7ed504 Bug 704369: Move logical emit. (r=Waldo) 2011-11-22 11:21:28 -08:00
Chris Leary
b0b21c4703 Bug 704369: Factor call/new emit. (r=Waldo) 2011-11-22 11:17:42 -08:00
Chris Leary
53fdd77185 Bug 704369: Move call/new emit. (r=Waldo) 2011-11-22 11:16:49 -08:00
Chris Leary
4ef470d2b4 Bug 704369: Factor delete emit. (r=Waldo) 2011-11-22 11:12:12 -08:00
Chris Leary
cac1e70334 Bug 704369: Move delete emit. (r=Waldo) 2011-11-22 11:09:15 -08:00
Chris Leary
6a71cf368f Bug 704369: Factor statements emit. (r=Waldo) 2011-11-22 11:05:32 -08:00
Chris Leary
fc83a52493 Bug 704369: Move statements emit. (r=Waldo) 2011-11-22 10:59:25 -08:00
Chris Leary
5768ef7d97 Bug 704369: Factor return emit. (r=Waldo) 2011-11-22 10:48:49 -08:00
Chris Leary
a93ced5fd1 Bug 704369: Move return emit. (r=Waldo) 2011-11-22 10:47:24 -08:00
Chris Leary
f8134f3546 Bug 704369: Factor continue emit. (r=Waldo) 2011-11-22 10:45:37 -08:00
Chris Leary
d99969042a Bug 704369: Move continue emit. (r=Waldo) 2011-11-22 10:43:10 -08:00
Chris Leary
a9f171e11c Bug 704369: Factor break emit. (r=Waldo) 2011-11-22 10:41:11 -08:00
Chris Leary
9871fc84fa Bug 704369: Move break emit. (r=Waldo) 2011-11-22 10:40:06 -08:00
Chris Leary
49f2e349f3 Bug 704369: Factor while emit. (r=Waldo) 2011-11-22 10:37:25 -08:00
Chris Leary
5787980ae7 Bug 704369: Move while emit. (r=Waldo) 2011-11-21 17:59:27 -08:00
Chris Leary
efabf9287d Bug 704369: Factor do-while emit. (r=Waldo) 2011-11-21 17:56:17 -08:00
Chris Leary
7e53b59f0e Bug 704369: Move do-while emit. (r=Waldo) 2011-11-21 17:54:57 -08:00
Chris Leary
8ac39a0b8a Bug 704369: Factor function emit. (r=Waldo) 2011-11-21 17:50:43 -08:00
Chris Leary
c65cde124f Bug 704369: Move function emit. (r=Waldo) 2011-11-21 17:29:56 -08:00
Chris Leary
d0ca3bb198 Back out c0e237b26fe2 because it's folded. (r=#jsapi) 2011-12-06 11:52:59 -08:00
Jim Blandy
f02ea01423 Bug 687683: Collect resumption values from onEnterFrame handlers, and respect them. r=jorendorff
This patch makes SpiderMonkey respect resumption values returned by
Debugger onEnterFrame handler functions, as documented.

In Debugger, we change fireEnterFrame to collect a resumption value from
the hook, and change onEnterFrame and slowPathOnEnterFrame to propagate
them out. These now need an 'rval' argument, so that they can return forced
return values and exceptions.

ScriptDebugPrologue now accepts a JSTrapStatus from Debugger::onEnterFrame,
takes care of placing the return value or exception where it belongs, and
returns a JSTrapStatus.

Calls to ScriptDebugPrologue now handle the JSTrapStatus:
- at the head of js::Interpret;
- in the JSOP_NEW/JSOP_CALL/JSOP_FUNCALL/JSOP_FUNAPPLY case;
- in stubs::ScriptDebugPrologue, which JM epilogues call; and
- in the REJOIN_THIS_PROTOTYPE case in js_InternalInterpret (you must add a
  JS_GC call to ic::GetPropNoCache for Debugger-onEnterFrame-resumption-05.js to
  hit this reliably).

We also rearrange the js_InternalThrow JSTrapStatus-handling switch statement to
have an explicit default case that raises a JS_NOT_REACHED assertion, instead of
just omitting JSTRAP_CONTINUE.
2011-12-06 11:40:28 -08:00
Jim Blandy
de97f716fe Bug 687683: Assert that REJOIN_CHECK_ARGUMENTS and REJOIN_FUNCTION_PROLOGUE are never generated in debug mode. r=bhackett1024
Explanation in the comments.

Fixing bug 699196 properly entails replacing the assertion this patch adds
with real code to call ScriptDebugPrologue. If this patch lands, hopefully
the person fixing 669196 will notice that and write tests that reach the
assertion/new code, but just to make sure we should probably add a note to
that bug about it.
2011-12-06 11:40:27 -08:00
Jim Blandy
b756212969 Bug 687683: Some random comment fixes I came across. r=jorendorff 2011-12-06 11:40:27 -08:00
Jim Blandy
5a44cb887e Bug 687683: Separate ScriptDebugPrologue add ScriptDebugEpilogue from and ScriptPrologue and ScriptEpilogue. r=jorendorff
At the moment, ScriptDebugPrologue is called (conditionally) from within
ScriptPrologue. For onEnterFrame handlers to be able to return a resumption
value, we need ScriptDebugPrologue to return a JSTrapStatus value, but it
is (non-debug) ScriptPrologue's callers that would need to handle those
values.

It seems strange to have ScriptPrologue return a JSTrapStatus. So this
patch brings ScriptDebugPrologue out of ScriptPrologue (and
ScriptPrologueOrGeneratorResume), and has ScriptPrologue's callers call
ScriptDebugPrologue explicitly.

For symmetry, we do the same with ScriptEpilogue,
ScriptEpilogueOrGeneratorYield, and ScriptDebugEpilogue.

Actually adding and processing the JSTrapStatus values comes in a later
patch. This is just meant to be a behavior-preserving rearrangement.
2011-12-06 11:40:27 -08:00
Jim Blandy
b47adbd950 Bug 687683: Remove unnecessary 'js::' namespace prefixes from Debugger code. r=jorendorff 2011-12-06 11:40:27 -08:00
David Mandelin
a3494e61a0 Bug 707351: remove tracer-specific things in jit-tests, r=dvander
--HG--
extra : rebase_source : 363730ebc4ab81d55b947b93f0cf9523e7efd8cf
2011-12-05 17:46:13 -08:00
Chris Leary
718eefc6c5 Bug 704369: Factor EmitTree to avoid recursion limit. (r=Waldo) 2011-12-06 10:50:23 -08:00
Bobby Holley
24850ce76d Bug 706301 - Tests. r=mrbkap 2011-12-06 11:05:26 -08:00
Bobby Holley
c4f54961de Bug 706301 - Don't cache own properties on XrayProxy. r=mrbkap 2011-12-06 11:05:26 -08:00
Tom Schuster
5ecd503d83 Bug 663338 - parseInt was wrong for very small doubles. r=jandem
--HG--
extra : rebase_source : 41c6581143053835665dc47d88f60d918be57450
2011-12-06 11:31:16 +01:00
Tom Schuster
126e8790cc Bug 700169 - Refactor code to use StringBuffer. r=Waldo
--HG--
extra : rebase_source : fefe9dcae3b2e227b9b32a17a976320eb9d71ba3
2011-12-06 11:31:00 +01:00
Brian Hackett
4db5a06fc1 JS_GetFrameFunction should return canonical script function, bug 707613. r=luke 2011-12-05 15:31:31 -08:00
Nicholas Nethercote
0745fbcf8f Bug 704723 - Add memory reporter for XPConnect. r=mrbkap. 2011-12-05 14:24:28 -08:00
Igor Bukanov
61697acb51 Bug 707645 - Fix set-but-unused warnings reported by GCC 4.6 in jsobj.cpp. r=bhackett1024 2011-12-05 17:11:16 +01:00
Nicholas Nethercote
f00e4c5240 Bug 707125 - Shrink the final string in str_unescape if possible. r=luke. 2011-12-04 20:50:52 -08:00
Phil Ringnalda
2147b76a08 Back out e0cb9fb30750 (bug 707051) for test failures 2011-12-04 18:48:54 -08:00
Bill McCloskey
b64fad1f54 Bug 707051 - Change MarkChildren for shapes (r=igor) 2011-12-04 17:16:21 -08:00
Igor Bukanov
795ee3e592 bug 707114 - inline JSLinearString::mark. r=wmccloskey
--HG--
extra : rebase_source : b974429fecda0f4ba29612e0065bb2215fe7b8c2
2011-12-05 01:59:45 +01:00
Ed Morley
25b5e3e769 Merge mozilla-central and mozilla-inbound 2011-12-04 15:04:54 +00:00
Jim Blandy
df8d965b47 Bug 700070: Have stubs::AnyFrameEpilogue call the full ScriptEpilogue before StackFrame::functionEpilogue, not just ScriptDebugEpilogue after functionEpilogue. r=jorendorff
The debugger tests don't try returning all four kinds of resumption values
from an onExceptionUnwind handler, and under JaegerMonkey, forcing a
constructor to return a primitive can cause an assertion:

Assertion failure: !args.rval().isPrimitive(), at /home/jimb/moz/dbg/js/src/jsinterp.cpp:651

This patch changes AnyFrameEpilogue to match what the interpreter and
mjit::Compiler::emitReturn does, and adds test cases for all the resumption
values.
2011-12-03 18:51:30 -08:00
Ms2ger
9e8128012d Bug 705357 - Use IDL for Components.utils.getGlobalForObject; r=bholley 2011-12-03 22:50:16 +01:00
Ms2ger
5cfbf6cd8a Bug 705333 - Use IDL for nsJSCID::{CreateInstance,GetService}; r=bholley 2011-12-03 22:50:16 +01:00
Kyle Huey
501b6f1760 Merge b-s to m-c. 2011-12-03 16:27:21 -05:00
Brian Hackett
f0c35c0584 Merge MC -> JM 2011-12-03 10:34:26 -08:00
Antti Haapala
05b303b524 Bug 699156: Support TypedArrays in XPConnect. r=bholley,evilpie 2011-12-03 09:33:20 -05:00
Hannes Verschore
7e2997e6b4 Add testcase for bug 476088. r=jruderman 2011-12-03 03:29:59 -05:00
Hannes Verschore
6a2f03a63f Add a test for bug 373843. r=jruderman 2011-12-03 03:29:59 -05:00
Brian Hackett
98abec9b55 Merge MC -> JM 2011-12-01 11:51:09 -08:00
Brian Hackett
5ecccc93ab Merge MC -> JM 2011-11-30 12:45:27 -08:00
Brian Hackett
44ae4685c4 Avoid scratch register collision when comparing an absolute address to an immediate, bug 703047. 2011-11-29 18:41:38 -08:00
Brian Hackett
fd7a549aaf Manually check prototypes of objects with uncacheable prototypes in ICs, bug 703047. 2011-11-29 13:37:18 -08:00
Brian Hackett
ba7e5d8276 Remove bogus assert, bug 705873. 2011-11-28 17:58:00 -08:00
Brian Hackett
031d257786 Always generate new shapes when setting uncacheable flags after prototype changes, don't cache native iterators for objects with uncacheable prototypes, bug 705895. 2011-11-28 17:27:00 -08:00
Brian Hackett
e970326d58 Add API for JSD to get the parent of a scope object, no bug. 2011-11-28 07:43:31 -08:00
Brian Hackett
c3b9744976 Merge MC -> JM 2011-11-26 15:03:20 -08:00
Brian Hackett
8e640c3889 Fix inverted test, improve test when marking objects with uncacheable prototypes, bug 703047. 2011-11-25 17:45:41 -05:00
Brian Hackett
70faf0ae00 Allow one prototype change before marking an object's prototype as uncacheable, bug 703047. 2011-11-25 16:01:08 -05:00
Brian Hackett
8ec1ac50d4 Use correct base address for computing allocated size of object elements, bug 704372. 2011-11-23 22:01:08 -05:00
Brian Hackett
2fe0d7c890 Don't trigger write barrier when initializing private data of new objects, bug 704136. 2011-11-22 18:21:10 -05:00
Brian Hackett
c26fc2aa88 Fix misuse of shape->slot(), bug 703818. 2011-11-22 17:44:26 -05:00
Brian Hackett
74b1236011 Check for uncacheable prototypes during ADDPROP IC, bug 704138. 2011-11-22 17:24:59 -05:00
Brian Hackett
674b11c47e Treat EXTENSIBLE_PARENTS as an object flag, bug 704134. 2011-11-22 16:49:47 -05:00
Brian Hackett
8b5b277f7c Add about:memory reporters for per compartment shape tables, bug 704372. 2011-11-21 20:29:05 -05:00
Brian Hackett
4e104973cd Dense arrays should have numFixedSlots() == 0, regardless of size class. bug 704348 2011-11-21 19:20:39 -05:00
Brian Hackett
b7108dd598 Speed up adding new properties with a common base shape, bug 704327. 2011-11-21 18:33:55 -05:00
Bobby Holley
26cc5f0c55 Bug 705019 - Allow access to {C,Pointer,Struct,Array,Function}Type.prototype.prototype. r=jorendorff 2011-11-29 18:29:19 -08:00
Bobby Holley
373b613af3 Bug 705019 - Make toSource() and toString() work on sCTypeProtoClass and sCDataProtoClass objects. r=jorendorff 2011-11-29 18:26:12 -08:00
Bobby Holley
457374946b Bug 705019 - Introduce CType::IsCTypeProto() and CData::isCDataProto(). r=jorendorff 2011-11-29 18:26:12 -08:00
Chris Leary
7822e56c0d Bug 691299: Lower maximum quantifier. (r=dmandelin)
--HG--
extra : rebase_source : ea2cdc1664171309d60c02094913483e2af3a61a
2011-11-29 15:24:44 -08:00
Brian Hackett
43a83a7006 Only inline construction of 'this' for 'new' on singleton functions, bug 706110. r=billm 2011-11-29 13:26:37 -08:00
Chris Leary
fae62a16ef Bug 691797: Optimize RegExp.prototype.test with leading .*, take 2. (r=mrbkap,luke)
--HG--
extra : rebase_source : 49c190dc6dec6ab2a05fbbd1479135082a053690
2011-11-28 13:35:12 -08:00
Brian Hackett
e799d1a5b0 Merge mozilla-central and mozilla-inbound 2011-12-03 14:36:54 -08:00
Makoto Kato
fc3b1a3f9e Bug 655658 - NetUtil.readInputStreamToString should have aCharset argument as optional. r=sdwilsh, sr=bz 2011-11-25 11:23:41 +09:00
Tom Schuster
7fee1d3cb0 Bug 602212 - Use error message from js.msg when CSP blocks a call to eval r=jorendorff 2011-11-24 19:39:02 +01:00
Tom Schuster
616aa669c1 Bug 705168 - Followup to remove some references to the tracer in the methodjit r=dvander 2011-11-24 19:38:57 +01:00
Andrew McCreight
c76f9e1244 Bug 668855, part 6: test weak maps and the cycle collector. r=gal 2011-11-24 07:35:57 -05:00
Brian Hackett
3c0c276269 Merge MC -> JM 2011-11-18 18:02:40 -08:00
Brian Hackett
8c117e4700 Remove assertion, no bug. 2011-11-18 17:37:37 -08:00
Brian Hackett
4fa685ec83 Fix incorrect loadPayload, bug 703721. 2011-11-18 17:03:50 -08:00