Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 11751c0efe27 (bug 951439) for mass bustage.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-12-18 19:39:33 -05:00
parent b5eeb3ac87
commit ebcd5b6587
13 changed files with 6 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/builtin/RegExp.cpp
View File

@ -611,8 +611,8 @@ ExecuteRegExp(JSContext *cx, CallArgs args, MatchConduit &matches)
/* ES5 15.10.6.2. */
static bool
regexp_exec_impl(JSContext *cx, HandleObject regexp, HandleString string,
RegExpStaticsUpdate staticsUpdate, MutableHandleValue rval)
regexp_exec_impl(JSContext *cx, CallArgs args, HandleObject regexp, HandleString string,
RegExpStaticsUpdate staticsUpdate)
{
/* Execute regular expression and gather matches. */
ScopedMatchPairs matches(&cx->tempLifoAlloc());
@ -624,11 +624,11 @@ regexp_exec_impl(JSContext *cx, HandleObject regexp, HandleString string,
return false;
if (status == RegExpRunStatus_Success_NotFound) {
rval.setNull();
args.rval().setNull();
return true;
}
return CreateRegExpMatchResult(cx, string, matches, rval);
return CreateRegExpMatchResult(cx, string, matches, args.rval());
}
static bool
@ -639,7 +639,7 @@ regexp_exec_impl(JSContext *cx, CallArgs args)
if (!string)
return false;
return regexp_exec_impl(cx, regexp, string, UpdateRegExpStatics, args.rval());
return regexp_exec_impl(cx, args, regexp, string, UpdateRegExpStatics);
}
bool
@ -649,14 +649,6 @@ js::regexp_exec(JSContext *cx, unsigned argc, Value *vp)
return CallNonGenericMethod(cx, IsRegExp, regexp_exec_impl, args);
}
/* Separate interface for use by IonMonkey. */
bool
js::regexp_exec_raw(JSContext *cx, HandleObject regexp, HandleString input, Value *vp)
{
MutableHandleValue vpHandle = MutableHandleValue::fromMarkedLocation(vp);
return regexp_exec_impl(cx, regexp, input, UpdateRegExpStatics, vpHandle);
}
bool
js::regexp_exec_no_statics(JSContext *cx, unsigned argc, Value *vp)
{
@ -668,7 +660,7 @@ js::regexp_exec_no_statics(JSContext *cx, unsigned argc, Value *vp)
RootedObject regexp(cx, &args[0].toObject());
RootedString string(cx, args[1].toString());
return regexp_exec_impl(cx, regexp, string, DontUpdateRegExpStatics, args.rval());
return regexp_exec_impl(cx, args, regexp, string, DontUpdateRegExpStatics);
}
/* ES5 15.10.6.3. */

3
js/src/builtin/RegExp.h
View File

@ -48,9 +48,6 @@ bool
CreateRegExpMatchResult(JSContext *cx, HandleString input, const jschar *chars, size_t length,
MatchPairs &matches, MutableHandleValue rval);
extern bool
regexp_exec_raw(JSContext *cx, HandleObject regexp, HandleString input, Value *vp);
extern bool
regexp_exec(JSContext *cx, unsigned argc, Value *vp);

12
js/src/jit/CodeGenerator.cpp
View File

@ -767,18 +767,6 @@ CodeGenerator::visitRegExp(LRegExp *lir)
return callVM(CloneRegExpObjectInfo, lir);
}
typedef bool (*RegExpExecRawFn)(JSContext *cx, HandleObject regexp,
HandleString input, Value *vp);
static const VMFunction RegExpExecRawInfo = FunctionInfo<RegExpExecRawFn>(regexp_exec_raw);
bool
CodeGenerator::visitRegExpExec(LRegExpExec *lir)
{
pushArg(ToRegister(lir->string()));
pushArg(ToRegister(lir->regexp()));
return callVM(RegExpExecRawInfo, lir);
}
typedef bool (*RegExpTestRawFn)(JSContext *cx, HandleObject regexp,
HandleString input, bool *result);
static const VMFunction RegExpTestRawInfo = FunctionInfo<RegExpTestRawFn>(regexp_test_raw);

1
js/src/jit/CodeGenerator.h
View File

@ -90,7 +90,6 @@ class CodeGenerator : public CodeGeneratorSpecific
bool visitDoubleToString(LDoubleToString *lir);
bool visitInteger(LInteger *lir);
bool visitRegExp(LRegExp *lir);
bool visitRegExpExec(LRegExpExec *lir);
bool visitRegExpTest(LRegExpTest *lir);
bool visitLambda(LLambda *lir);
bool visitLambdaForSingleton(LLambdaForSingleton *lir);

1
js/src/jit/IonBuilder.h
View File

@ -630,7 +630,6 @@ class IonBuilder : public MIRGenerator
InliningStatus inlineStrCharAt(CallInfo &callInfo);
// RegExp natives.
InliningStatus inlineRegExpExec(CallInfo &callInfo);
InliningStatus inlineRegExpTest(CallInfo &callInfo);
// Array intrinsics.

23
js/src/jit/LIR-Common.h
View File

@ -3215,29 +3215,6 @@ class LRegExp : public LCallInstructionHelper<1, 0, 0>
}
};
class LRegExpExec : public LCallInstructionHelper<1, 2, 0>
{
public:
LIR_HEADER(RegExpExec)
LRegExpExec(const LAllocation &regexp, const LAllocation &string)
{
setOperand(0, regexp);
setOperand(1, string);
}
const LAllocation *regexp() {
return getOperand(0);
}
const LAllocation *string() {
return getOperand(1);
}
const MRegExpExec *mir() const {
return mir_->toRegExpExec();
}
};
class LRegExpTest : public LCallInstructionHelper<1, 2, 0>
{
public:

1
js/src/jit/LOpcodes.h
View File

@ -149,7 +149,6 @@
_(OsrReturnValue) \
_(OsrArgumentsObject) \
_(RegExp) \
_(RegExpExec) \
_(RegExpTest) \
_(Lambda) \
_(LambdaForSingleton) \

11
js/src/jit/Lowering.cpp
View File

@ -1945,17 +1945,6 @@ LIRGenerator::visitRegExp(MRegExp *ins)
return defineReturn(lir, ins) && assignSafepoint(lir, ins);
}
bool
LIRGenerator::visitRegExpExec(MRegExpExec *ins)
{
JS_ASSERT(ins->regexp()->type() == MIRType_Object);
JS_ASSERT(ins->string()->type() == MIRType_String);
LRegExpExec *lir = new(alloc()) LRegExpExec(useRegisterAtStart(ins->regexp()),
useRegisterAtStart(ins->string()));
return defineReturn(lir, ins) && assignSafepoint(lir, ins);
}
bool
LIRGenerator::visitRegExpTest(MRegExpTest *ins)
{

1
js/src/jit/Lowering.h
View File

@ -162,7 +162,6 @@ class LIRGenerator : public LIRGeneratorSpecific
bool visitTruncateToInt32(MTruncateToInt32 *truncate);
bool visitToString(MToString *convert);
bool visitRegExp(MRegExp *ins);
bool visitRegExpExec(MRegExpExec *ins);
bool visitRegExpTest(MRegExpTest *ins);
bool visitLambda(MLambda *ins);
bool visitLambdaPar(MLambdaPar *ins);

30
js/src/jit/MCallOptimize.cpp
View File

@ -119,8 +119,6 @@ IonBuilder::inlineNativeCall(CallInfo &callInfo, JSNative native)
return inlineStrCharAt(callInfo);
// RegExp natives.
if (native == regexp_exec && CallResultEscapes(pc))
return inlineRegExpExec(callInfo);
if (native == regexp_exec && !CallResultEscapes(pc))
return inlineRegExpTest(callInfo);
if (native == regexp_test)
@ -1068,34 +1066,6 @@ IonBuilder::inlineStrCharAt(CallInfo &callInfo)
return InliningStatus_Inlined;
}
IonBuilder::InliningStatus
IonBuilder::inlineRegExpExec(CallInfo &callInfo)
{
if (callInfo.argc() != 1 || callInfo.constructing())
return InliningStatus_NotInlined;
if (callInfo.thisArg()->type() != MIRType_Object)
return InliningStatus_NotInlined;
types::TemporaryTypeSet *thisTypes = callInfo.thisArg()->resultTypeSet();
const Class *clasp = thisTypes ? thisTypes->getKnownClass() : nullptr;
if (clasp != &RegExpObject::class_)
return InliningStatus_NotInlined;
if (callInfo.getArg(0)->type() != MIRType_String)
return InliningStatus_NotInlined;
callInfo.unwrapArgs();
MInstruction *exec = MRegExpExec::New(alloc(), callInfo.thisArg(), callInfo.getArg(0));
current->add(exec);
current->push(exec);
if (!resumeAfter(exec))
return InliningStatus_Error;
return InliningStatus_Inlined;
}
IonBuilder::InliningStatus
IonBuilder::inlineRegExpTest(CallInfo &callInfo)
{

37
js/src/jit/MIR.h
View File

@ -4892,43 +4892,6 @@ class MRegExp : public MNullaryInstruction
}
};
class MRegExpExec
: public MBinaryInstruction,
public MixPolicy<ObjectPolicy<1>, StringPolicy<0> >
{
private:
MRegExpExec(MDefinition *regexp, MDefinition *string)
: MBinaryInstruction(string, regexp)
{
// May be object or null.
setResultType(MIRType_Value);
}
public:
INSTRUCTION_HEADER(RegExpExec)
static MRegExpExec *New(TempAllocator &alloc, MDefinition *regexp, MDefinition *string) {
return new(alloc) MRegExpExec(regexp, string);
}
MDefinition *string() const {
return getOperand(0);
}
MDefinition *regexp() const {
return getOperand(1);
}
TypePolicy *typePolicy() {
return this;
}
bool possiblyCalls() const {
return true;
}
};
class MRegExpTest
: public MBinaryInstruction,
public MixPolicy<ObjectPolicy<1>, StringPolicy<0> >

1
js/src/jit/MOpcodes.h
View File

@ -100,7 +100,6 @@ namespace jit {
_(OsrEntry) \
_(Nop) \
_(RegExp) \
_(RegExpExec) \
_(RegExpTest) \
_(Lambda) \
_(ImplicitThis) \

1
js/src/jit/ParallelSafetyAnalysis.cpp
View File

@ -281,7 +281,6 @@ class ParallelSafetyVisitor : public MInstructionVisitor
UNSAFE_OP(Pow)
UNSAFE_OP(PowHalf)
UNSAFE_OP(RegExpTest)
UNSAFE_OP(RegExpExec)
UNSAFE_OP(CallInstanceOf)
UNSAFE_OP(FunctionBoundary)
UNSAFE_OP(GuardString)