Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 17:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 815652 - Remove accidental temporary rooting object (r=bhackett)

Browse Source
This commit is contained in:
Bill McCloskey 2012-11-27 13:59:13 -08:00
parent 03de16d9f8
commit 9dcd123cfb
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/ion/CompilerRoot.h
View File

@ -21,10 +21,6 @@ template <typename T>
class CompilerRoot : public CompilerRootNode
{
public:
CompilerRoot()
: CompilerRootNode(NULL)
{ }
CompilerRoot(T ptr)
: CompilerRootNode(NULL)
{
@ -46,6 +42,11 @@ class CompilerRoot : public CompilerRootNode
public:
operator T () const { return static_cast<T>(ptr); }
T operator ->() const { return static_cast<T>(ptr); }
private:
CompilerRoot() MOZ_DELETE;
CompilerRoot(const CompilerRoot<T> &) MOZ_DELETE;
CompilerRoot<T> &operator =(const CompilerRoot<T> &) MOZ_DELETE;
};
typedef CompilerRoot<JSObject*> CompilerRootObject;

4
js/src/ion/MIR.h
View File

@ -5254,9 +5254,9 @@ class MInstanceOf
public:
MInstanceOf(MDefinition *obj, RawObject proto)
: MUnaryInstruction(obj)
: MUnaryInstruction(obj),
protoObj_(proto)
{
protoObj_ = proto;
setResultType(MIRType_Boolean);
}

10
js/src/jit-test/tests/basic/bug815652.js Normal file
View File

@ -0,0 +1,10 @@
gczeal(9, 2)
function testScatterConflict() {
var p = new ParallelArray([1,2,3,4,5]);
var r = p.scatter([0,1,0,3,(0)], 9, function (a,b) { return a+b; });
function assertEqParallelArray(a, b)
assertEq(a instanceof ParallelArray, true);
assertEqParallelArray(r, new ParallelArray([4,2,(false),4,5]));
}
testScatterConflict();