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

Backed out changeset b19674e5222c (bug 1028867) under suspicion of making Windows PGO bc1 incredibly failure-prone on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2014-06-25 15:46:28 -07:00
parent 4d9e33f028
commit 558dbf68d1
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/shell/js.cpp
View File

@ -2958,7 +2958,7 @@ EvalInWorker(JSContext *cx, unsigned argc, jsval *vp)
jschar *chars = (jschar *) js_malloc(str->length() * sizeof(jschar));
if (!chars)
return false;
CopyChars(chars, *str);
PodCopy(chars, str->chars(), str->length());
WorkerInput *input = js_new<WorkerInput>(cx->runtime(), chars, str->length());
if (!input)
@ -4528,11 +4528,6 @@ ToLatin1(JSContext *cx, unsigned argc, Value *vp)
return true;
}
if (args[0].toString()->hasLatin1Chars()) {
args.rval().set(args[0]);
return true;
}
JSLinearString *s = &args[0].toString()->asLinear();
s->debugUnsafeConvertToLatin1();
args.rval().setString(s);
@ -6318,7 +6313,6 @@ main(int argc, char **argv, char **envp)
"to test JIT codegen (no-op on platforms other than x86 and x64).")
|| !op.addBoolOption('\0', "fuzzing-safe", "Don't expose functions that aren't safe for "
"fuzzers to call")
|| !op.addBoolOption('\0', "latin1-strings", "Enable Latin1 strings (default: off)")
#ifdef DEBUG
|| !op.addBoolOption('\0', "dump-entrained-variables", "Print variables which are "
"unnecessarily entrained by inner functions")
@ -6391,11 +6385,6 @@ main(int argc, char **argv, char **envp)
#endif // DEBUG
// Set this option before initializing the JSRuntime, so that Latin1 strings
// are used for strings allocated during initialization.
if (op.getBoolOption("latin1-strings"))
js::EnableLatin1Strings = true;
#ifdef JS_THREADSAFE
// The fake thread count must be set before initializing the Runtime,
// which spins up the thread pool.

2
js/src/tests/lib/tests.py
View File

@ -14,7 +14,7 @@ TBPL_FLAGS = [
[], # no flags, normal baseline and ion
['--ion-eager', '--ion-offthread-compile=off'], # implies --baseline-eager
['--ion-eager', '--ion-offthread-compile=off', '--ion-check-range-analysis', '--no-sse3'],
['--baseline-eager', '--latin1-strings'],
['--baseline-eager'],
['--baseline-eager', '--no-fpu'],
['--no-baseline', '--no-ion'],
]

2
js/src/vm/String.cpp
View File

@ -868,8 +868,6 @@ AutoStableStringChars::initTwoByte(JSContext *cx, JSString *s)
return true;
}
bool js::EnableLatin1Strings = false;
#ifdef DEBUG
void
JSAtom::dump()

6
js/src/vm/String.h
View File

@ -519,6 +519,9 @@ class JSString : public js::gc::BarrieredCell<JSString>
void operator=(const JSString &other) MOZ_DELETE;
};
/* Temporary flag to enable Latin1 strings (bug 998392). */
static const bool EnableLatin1Strings = false;
class JSRope : public JSString
{
template <typename CharT>
@ -999,9 +1002,6 @@ JS_STATIC_ASSERT(sizeof(JSAtom) == sizeof(JSString));
namespace js {
/* Temporary flag to enable Latin1 strings (bug 998392). */
extern bool EnableLatin1Strings;
/*
* Thread safe RAII wrapper for inspecting the contents of JSStrings. The
* thread safe operations such as |getCharsNonDestructive| require allocation