Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 7218723f5a9b (bug 956051) for bustage.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-01-17 11:05:11 -05:00
parent 381fac62ca
commit 29d84433c5
15 changed files with 51 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,7 +789,7 @@ CodeGenerator::visitRegExpTest(LRegExpTest *lir)
}
typedef JSString *(*RegExpReplaceFn)(JSContext *, HandleString, HandleObject, HandleString);
static const VMFunction RegExpReplaceInfo = FunctionInfo<RegExpReplaceFn>(RegExpReplace);
static const VMFunction RegExpReplaceInfo = FunctionInfo<RegExpReplaceFn>(regexp_replace);
bool
CodeGenerator::visitRegExpReplace(LRegExpReplace *lir)
@ -799,7 +799,7 @@ CodeGenerator::visitRegExpReplace(LRegExpReplace *lir)
else
pushArg(ToRegister(lir->replacement()));
pushArg(ToRegister(lir->pattern()));
pushArg(ToRegister(lir->regexp()));
if (lir->string()->isConstant())
pushArg(ImmGCPtr(lir->string()->toConstant()->toString()));
@ -809,31 +809,6 @@ CodeGenerator::visitRegExpReplace(LRegExpReplace *lir)
return callVM(RegExpReplaceInfo, lir);
}
typedef JSString *(*StringReplaceFn)(JSContext *, HandleString, HandleString, HandleString);
static const VMFunction StringReplaceInfo = FunctionInfo<StringReplaceFn>(StringReplace);
bool
CodeGenerator::visitStringReplace(LStringReplace *lir)
{
if (lir->replacement()->isConstant())
pushArg(ImmGCPtr(lir->replacement()->toConstant()->toString()));
else
pushArg(ToRegister(lir->replacement()));
if (lir->pattern()->isConstant())
pushArg(ImmGCPtr(lir->pattern()->toConstant()->toString()));
else
pushArg(ToRegister(lir->pattern()));
if (lir->string()->isConstant())
pushArg(ImmGCPtr(lir->string()->toConstant()->toString()));
else
pushArg(ToRegister(lir->string()));
return callVM(StringReplaceInfo, lir);
}
typedef JSObject *(*LambdaFn)(JSContext *, HandleFunction, HandleObject);
static const VMFunction LambdaInfo =
FunctionInfo<LambdaFn>(js::Lambda);

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

@ -93,7 +93,6 @@ class CodeGenerator : public CodeGeneratorSpecific
bool visitRegExpExec(LRegExpExec *lir);
bool visitRegExpTest(LRegExpTest *lir);
bool visitRegExpReplace(LRegExpReplace *lir);
bool visitStringReplace(LStringReplace *lir);
bool visitLambda(LLambda *lir);
bool visitLambdaForSingleton(LLambdaForSingleton *lir);
bool visitLambdaPar(LLambdaPar *lir);

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

@ -629,7 +629,7 @@ class IonBuilder : public MIRGenerator
InliningStatus inlineStrCharCodeAt(CallInfo &callInfo);
InliningStatus inlineStrFromCharCode(CallInfo &callInfo);
InliningStatus inlineStrCharAt(CallInfo &callInfo);
InliningStatus inlineStrReplace(CallInfo &callInfo);
InliningStatus inlineStrReplaceRegExp(CallInfo &callInfo);
// RegExp natives.
InliningStatus inlineRegExpExec(CallInfo &callInfo);

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

@ -3246,61 +3246,34 @@ class LRegExpTest : public LCallInstructionHelper<1, 2, 0>
}
};
class LStrReplace : public LCallInstructionHelper<1, 3, 0>
class LRegExpReplace : public LCallInstructionHelper<1, 3, 0>
{
public:
LStrReplace(const LAllocation &string, const LAllocation &pattern,
LIR_HEADER(RegExpReplace)
LRegExpReplace(const LAllocation &string, const LAllocation &regexp,
const LAllocation &replacement)
{
setOperand(0, string);
setOperand(1, pattern);
setOperand(1, regexp);
setOperand(2, replacement);
}
const LAllocation *string() {
return getOperand(0);
}
const LAllocation *pattern() {
const LAllocation *regexp() {
return getOperand(1);
}
const LAllocation *replacement() {
return getOperand(2);
}
};
class LRegExpReplace: public LStrReplace
{
public:
LIR_HEADER(RegExpReplace);
LRegExpReplace(const LAllocation &string, const LAllocation &pattern,
const LAllocation &replacement)
: LStrReplace(string, pattern, replacement)
{
}
const MRegExpReplace *mir() const {
return mir_->toRegExpReplace();
}
};
class LStringReplace: public LStrReplace
{
public:
LIR_HEADER(StringReplace);
LStringReplace(const LAllocation &string, const LAllocation &pattern,
const LAllocation &replacement)
: LStrReplace(string, pattern, replacement)
{
}
const MStringReplace *mir() const {
return mir_->toStringReplace();
}
};
class LLambdaForSingleton : public LCallInstructionHelper<1, 1, 0>
{
public:

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

@ -152,7 +152,6 @@
_(RegExpExec) \
_(RegExpTest) \
_(RegExpReplace) \
_(StringReplace) \
_(Lambda) \
_(LambdaForSingleton) \
_(LambdaPar) \

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

@ -1938,25 +1938,12 @@ LIRGenerator::visitRegExpTest(MRegExpTest *ins)
bool
LIRGenerator::visitRegExpReplace(MRegExpReplace *ins)
{
JS_ASSERT(ins->pattern()->type() == MIRType_Object);
JS_ASSERT(ins->regexp()->type() == MIRType_Object);
JS_ASSERT(ins->string()->type() == MIRType_String);
JS_ASSERT(ins->replacement()->type() == MIRType_String);
LRegExpReplace *lir = new(alloc()) LRegExpReplace(useRegisterOrConstantAtStart(ins->string()),
useRegisterAtStart(ins->pattern()),
useRegisterOrConstantAtStart(ins->replacement()));
return defineReturn(lir, ins) && assignSafepoint(lir, ins);
}
bool
LIRGenerator::visitStringReplace(MStringReplace *ins)
{
JS_ASSERT(ins->pattern()->type() == MIRType_String);
JS_ASSERT(ins->string()->type() == MIRType_String);
JS_ASSERT(ins->replacement()->type() == MIRType_String);
LStringReplace *lir = new(alloc()) LStringReplace(useRegisterOrConstantAtStart(ins->string()),
useRegisterAtStart(ins->pattern()),
useRegisterAtStart(ins->regexp()),
useRegisterOrConstantAtStart(ins->replacement()));
return defineReturn(lir, ins) && assignSafepoint(lir, ins);
}

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

@ -148,7 +148,6 @@ class LIRGenerator : public LIRGeneratorSpecific
bool visitRegExpExec(MRegExpExec *ins);
bool visitRegExpTest(MRegExpTest *ins);
bool visitRegExpReplace(MRegExpReplace *ins);
bool visitStringReplace(MStringReplace *ins);
bool visitLambda(MLambda *ins);
bool visitLambdaPar(MLambdaPar *ins);
bool visitImplicitThis(MImplicitThis *ins);

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

@ -120,7 +120,7 @@ IonBuilder::inlineNativeCall(CallInfo &callInfo, JSNative native)
if (native == js_str_charAt)
return inlineStrCharAt(callInfo);
if (native == str_replace)
return inlineStrReplace(callInfo);
return inlineStrReplaceRegExp(callInfo);
// RegExp natives.
if (native == regexp_exec && CallResultEscapes(pc))
@ -1174,7 +1174,7 @@ IonBuilder::inlineRegExpTest(CallInfo &callInfo)
}
IonBuilder::InliningStatus
IonBuilder::inlineStrReplace(CallInfo &callInfo)
IonBuilder::inlineStrReplaceRegExp(CallInfo &callInfo)
{
if (callInfo.argc() != 2 || callInfo.constructing())
return InliningStatus_NotInlined;
@ -1190,7 +1190,7 @@ IonBuilder::inlineStrReplace(CallInfo &callInfo)
// Arg 0: RegExp.
types::TemporaryTypeSet *arg0Type = callInfo.getArg(0)->resultTypeSet();
const Class *clasp = arg0Type ? arg0Type->getKnownClass() : nullptr;
if (clasp != &RegExpObject::class_ && callInfo.getArg(0)->type() != MIRType_String)
if (clasp != &RegExpObject::class_)
return InliningStatus_NotInlined;
// Arg 1: String.
@ -1199,18 +1199,13 @@ IonBuilder::inlineStrReplace(CallInfo &callInfo)
callInfo.setImplicitlyUsedUnchecked();
MInstruction *cte;
if (callInfo.getArg(0)->type() == MIRType_String) {
cte = MStringReplace::New(alloc(), callInfo.thisArg(), callInfo.getArg(0),
callInfo.getArg(1));
} else {
cte = MRegExpReplace::New(alloc(), callInfo.thisArg(), callInfo.getArg(0),
callInfo.getArg(1));
}
MInstruction *cte = MRegExpReplace::New(alloc(), callInfo.thisArg(), callInfo.getArg(0),
callInfo.getArg(1));
current->add(cte);
current->push(cte);
if (cte->isEffectful() && !resumeAfter(cte))
if (!resumeAfter(cte))
return InliningStatus_Error;
return InliningStatus_Inlined;
}

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

@ -4885,26 +4885,29 @@ class MRegExpTest
}
};
template <class Policy1>
class MStrReplace
class MRegExpReplace
: public MTernaryInstruction,
public Mix3Policy<StringPolicy<0>, Policy1, StringPolicy<2> >
public Mix3Policy<StringPolicy<0>, ObjectPolicy<1>, StringPolicy<2> >
{
protected:
private:
MStrReplace(MDefinition *string, MDefinition *pattern, MDefinition *replacement)
: MTernaryInstruction(string, pattern, replacement)
MRegExpReplace(MDefinition *string, MDefinition *regexp, MDefinition *replacement)
: MTernaryInstruction(string, regexp, replacement)
{
setMovable();
setResultType(MIRType_String);
}
public:
INSTRUCTION_HEADER(RegExpReplace)
static MRegExpReplace *New(TempAllocator &alloc, MDefinition *string, MDefinition *regexp, MDefinition *replacement) {
return new(alloc) MRegExpReplace(string, regexp, replacement);
}
MDefinition *string() const {
return getOperand(0);
}
MDefinition *pattern() const {
MDefinition *regexp() const {
return getOperand(1);
}
MDefinition *replacement() const {
@ -4920,46 +4923,6 @@ class MStrReplace
}
};
class MRegExpReplace
: public MStrReplace< ObjectPolicy<1> >
{
private:
MRegExpReplace(MDefinition *string, MDefinition *pattern, MDefinition *replacement)
: MStrReplace(string, pattern, replacement)
{
}
public:
INSTRUCTION_HEADER(RegExpReplace);
static MRegExpReplace *New(TempAllocator &alloc, MDefinition *string, MDefinition *pattern, MDefinition *replacement) {
return new(alloc) MRegExpReplace(string, pattern, replacement);
}
};
class MStringReplace
: public MStrReplace< StringPolicy<1> >
{
private:
MStringReplace(MDefinition *string, MDefinition *pattern, MDefinition *replacement)
: MStrReplace(string, pattern, replacement)
{
}
public:
INSTRUCTION_HEADER(StringReplace);
static MStringReplace *New(TempAllocator &alloc, MDefinition *string, MDefinition *pattern, MDefinition *replacement) {
return new(alloc) MStringReplace(string, pattern, replacement);
}
AliasSet getAliasSet() const {
return AliasSet::None();
}
};
struct LambdaFunctionInfo
{
// The functions used in lambdas are the canonical original function in

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

@ -101,7 +101,6 @@ namespace jit {
_(RegExpExec) \
_(RegExpTest) \
_(RegExpReplace) \
_(StringReplace) \
_(Lambda) \
_(ImplicitThis) \
_(Slots) \

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

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

20
js/src/jit/VMFunctions.cpp
View File

@ -914,10 +914,10 @@ JSObject *CreateDerivedTypedObj(JSContext *cx, HandleObject type,
}
JSString *
RegExpReplace(JSContext *cx, HandleString string, HandleObject regexp, HandleString repl)
regexp_replace(JSContext *cx, HandleString string, HandleObject regexp, HandleString repl)
{
JS_ASSERT(string);
JS_ASSERT(repl);
JS_ASSERT(!!string);
JS_ASSERT(!!repl);
RootedValue rval(cx);
if (!str_replace_regexp_raw(cx, string, regexp, repl, &rval))
@ -926,20 +926,6 @@ RegExpReplace(JSContext *cx, HandleString string, HandleObject regexp, HandleStr
return rval.toString();
}
JSString *
StringReplace(JSContext *cx, HandleString string, HandleString pattern, HandleString repl)
{
JS_ASSERT(string);
JS_ASSERT(pattern);
JS_ASSERT(repl);
RootedValue rval(cx);
if (!str_replace_string_raw(cx, string, pattern, repl, &rval))
return nullptr;
return rval.toString();
}
bool
Recompile(JSContext *cx)
{

6
js/src/jit/VMFunctions.h
View File

@ -663,10 +663,8 @@ JSObject *CreateDerivedTypedObj(JSContext *cx, HandleObject type,
HandleObject owner, int32_t offset);
bool Recompile(JSContext *cx);
JSString *RegExpReplace(JSContext *cx, HandleString string, HandleObject regexp,
HandleString repl);
JSString *StringReplace(JSContext *cx, HandleString string, HandleString pattern,
HandleString repl);
JSString *regexp_replace(JSContext *cx, HandleString string, HandleObject regexp,
HandleString repl);
#ifdef DEBUG
void AssertValidObjectPtr(JSContext *cx, JSObject *obj);

68
js/src/jsstr.cpp
View File

@ -1731,13 +1731,6 @@ class MOZ_STACK_CLASS StringRegExpGuard
return true;
}
bool init(JSContext *cx, HandleString pattern) {
fm.patstr = AtomizeString(cx, pattern);
if (!fm.patstr)
return false;
return true;
}
/*
* Attempt to match |patstr| to |textstr|. A flags argument, metachars in
* the pattern string, or a lengthy pattern string can thwart this process.
@ -2456,7 +2449,7 @@ ReplaceRegExp(JSContext *cx, RegExpStatics *res, ReplaceData &rdata)
static bool
BuildFlatReplacement(JSContext *cx, HandleString textstr, HandleString repstr,
const FlatMatch &fm, MutableHandleValue rval)
const FlatMatch &fm, CallArgs *args)
{
RopeBuilder builder(cx);
size_t match = fm.match();
@ -2528,7 +2521,7 @@ BuildFlatReplacement(JSContext *cx, HandleString textstr, HandleString repstr,
}
}
rval.setString(builder.result());
args->rval().setString(builder.result());
return true;
}
@ -2540,7 +2533,7 @@ BuildFlatReplacement(JSContext *cx, HandleString textstr, HandleString repstr,
*/
static inline bool
BuildDollarReplacement(JSContext *cx, JSString *textstrArg, JSLinearString *repstr,
const jschar *firstDollar, const FlatMatch &fm, MutableHandleValue rval)
const jschar *firstDollar, const FlatMatch &fm, CallArgs *args)
{
Rooted<JSLinearString*> textstr(cx, textstrArg->ensureLinear(cx));
if (!textstr)
@ -2612,7 +2605,7 @@ BuildDollarReplacement(JSContext *cx, JSString *textstrArg, JSLinearString *reps
builder.append(rightSide));
#undef ENSURE
rval.setString(builder.result());
args->rval().setString(builder.result());
return true;
}
@ -2867,47 +2860,11 @@ js::str_replace_regexp_raw(JSContext *cx, HandleString string, HandleObject rege
return StrReplaceRegExp(cx, rdata, rval);
}
static inline bool
StrReplaceString(JSContext *cx, ReplaceData &rdata, const FlatMatch &fm, MutableHandleValue rval)
{
/*
* Note: we could optimize the text.length == pattern.length case if we wanted,
* even in the presence of dollar metachars.
*/
if (rdata.dollar)
return BuildDollarReplacement(cx, rdata.str, rdata.repstr, rdata.dollar, fm, rval);
return BuildFlatReplacement(cx, rdata.str, rdata.repstr, fm, rval);
}
static const uint32_t ReplaceOptArg = 2;
bool
js::str_replace_string_raw(JSContext *cx, HandleString string, HandleString pattern,
HandleString replacement, MutableHandleValue rval)
{
ReplaceData rdata(cx);
rdata.str = string;
JSLinearString *repl = replacement->ensureLinear(cx);
if (!repl)
return false;
rdata.setReplacementString(repl);
if (!rdata.g.init(cx, pattern))
return false;
const FlatMatch *fm = rdata.g.tryFlatMatch(cx, rdata.str, ReplaceOptArg, ReplaceOptArg, false);
if (fm->match() < 0) {
rval.setString(string);
return true;
}
return StrReplaceString(cx, rdata, *fm, rval);
}
static inline bool
str_replace_flat_lambda(JSContext *cx, CallArgs outerArgs, ReplaceData &rdata, const FlatMatch &fm)
{
JS_ASSERT(fm.match() >= 0);
RootedString matchStr(cx, js_NewDependentString(cx, rdata.str, fm.match(), fm.patternLength()));
if (!matchStr)
return false;
@ -2954,6 +2911,8 @@ str_replace_flat_lambda(JSContext *cx, CallArgs outerArgs, ReplaceData &rdata, c
return true;
}
static const uint32_t ReplaceOptArg = 2;
/*
* Pattern match the script to check if it is is indexing into a particular
* object, e.g. 'function(a) { return b[a]; }'. Avoid calling the script in
@ -3058,7 +3017,6 @@ js::str_replace(JSContext *cx, unsigned argc, Value *vp)
*/
const FlatMatch *fm = rdata.g.tryFlatMatch(cx, rdata.str, ReplaceOptArg, args.length(), false);
if (!fm) {
if (cx->isExceptionPending()) /* oom in RopeMatch in tryFlatMatch */
return false;
@ -3072,7 +3030,15 @@ js::str_replace(JSContext *cx, unsigned argc, Value *vp)
if (rdata.lambda)
return str_replace_flat_lambda(cx, args, rdata, *fm);
return StrReplaceString(cx, rdata, *fm, args.rval());
/*
* Note: we could optimize the text.length == pattern.length case if we wanted,
* even in the presence of dollar metachars.
*/
if (rdata.dollar)
return BuildDollarReplacement(cx, rdata.str, rdata.repstr, rdata.dollar, *fm, &args);
return BuildFlatReplacement(cx, rdata.str, rdata.repstr, *fm, &args);
}
namespace {

4
js/src/jsstr.h
View File

@ -370,10 +370,6 @@ bool
str_replace_regexp_raw(JSContext *cx, HandleString string, HandleObject regexp,
HandleString replacement, MutableHandleValue rval);
bool
str_replace_string_raw(JSContext *cx, HandleString string, HandleString pattern,
HandleString replacement, MutableHandleValue rval);
} /* namespace js */
extern bool