зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1155006: Fix unified build sensitivities in js/src. r=shu
--HG-- extra : rebase_source : adc1361db68260d1e7e3ff9c12b827cf3e962b8b extra : histedit_source : 1e4442a49e57de9213605822370b97d8c25757f0
This commit is contained in:
Родитель
08536cb66d
Коммит
205761df0c
|
@ -55,8 +55,8 @@
|
|||
|
||||
#include "prmjtime.h"
|
||||
|
||||
#include "asmjs/AsmJSModule.h"
|
||||
#include "jit/AtomicOperations.h"
|
||||
|
||||
#include "js/Class.h"
|
||||
#include "vm/GlobalObject.h"
|
||||
#include "vm/SharedTypedArrayObject.h"
|
||||
|
|
|
@ -1503,7 +1503,7 @@ js::testingFunc_inJit(JSContext* cx, unsigned argc, jsval* vp)
|
|||
{
|
||||
CallArgs args = CallArgsFromVp(argc, vp);
|
||||
|
||||
if (!IsBaselineEnabled(cx)) {
|
||||
if (!jit::IsBaselineEnabled(cx)) {
|
||||
JSString* error = JS_NewStringCopyZ(cx, "Baseline is disabled.");
|
||||
if(!error)
|
||||
return false;
|
||||
|
@ -1531,7 +1531,7 @@ js::testingFunc_inIon(JSContext* cx, unsigned argc, jsval* vp)
|
|||
{
|
||||
CallArgs args = CallArgsFromVp(argc, vp);
|
||||
|
||||
if (!IsIonEnabled(cx)) {
|
||||
if (!jit::IsIonEnabled(cx)) {
|
||||
JSString* error = JS_NewStringCopyZ(cx, "Ion is disabled.");
|
||||
if (!error)
|
||||
return false;
|
||||
|
|
|
@ -7,8 +7,9 @@
|
|||
#ifndef ds_IdValuePair_h
|
||||
#define ds_IdValuePair_h
|
||||
|
||||
#include "NamespaceImports.h"
|
||||
#include "jsapi.h"
|
||||
|
||||
#include "NamespaceImports.h"
|
||||
#include "js/Id.h"
|
||||
|
||||
namespace js {
|
||||
|
|
|
@ -346,7 +346,7 @@ ArenaLists::allocateFromArena(JS::Zone* zone, AllocKind thingKind,
|
|||
AutoMaybeStartBackgroundAllocation& maybeStartBGAlloc)
|
||||
{
|
||||
JSRuntime* rt = zone->runtimeFromAnyThread();
|
||||
Maybe<AutoLockGC> maybeLock;
|
||||
mozilla::Maybe<AutoLockGC> maybeLock;
|
||||
|
||||
// See if we can proceed without taking the GC lock.
|
||||
if (backgroundFinalizeState[thingKind] != BFS_DONE)
|
||||
|
|
|
@ -45,7 +45,7 @@ BEGIN_TEST(testForwardSetProperty)
|
|||
|
||||
// Non-strict setter
|
||||
|
||||
ObjectOpResult result;
|
||||
JS::ObjectOpResult result;
|
||||
CHECK(JS_ForwardSetPropertyTo(cx, obj2, prop, setval, v3, result));
|
||||
CHECK(result);
|
||||
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
#include "jsapi-tests/tests.h"
|
||||
|
||||
using mozilla::ArrayLength;
|
||||
|
||||
BEGIN_TEST(testJSEvaluateScript)
|
||||
{
|
||||
JS::RootedObject obj(cx, JS_NewPlainObject(cx));
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#ifndef jsapi_tests_tests_h
|
||||
#define jsapi_tests_tests_h
|
||||
|
||||
#include "mozilla/ArrayUtils.h"
|
||||
#include "mozilla/TypeTraits.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
|
|
@ -125,7 +125,7 @@ class AutoClearPendingException
|
|||
{ }
|
||||
|
||||
~AutoClearPendingException() {
|
||||
cx->clearPendingException();
|
||||
JS_ClearPendingException(cx);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -4314,7 +4314,7 @@ SetSharedArrayBuffer(JSContext* cx, unsigned argc, Value* vp)
|
|||
return true;
|
||||
}
|
||||
|
||||
class SprintOptimizationTypeInfoOp : public ForEachTrackedOptimizationTypeInfoOp
|
||||
class SprintOptimizationTypeInfoOp : public JS::ForEachTrackedOptimizationTypeInfoOp
|
||||
{
|
||||
Sprinter* sp;
|
||||
bool startedTypes_;
|
||||
|
@ -4345,7 +4345,7 @@ class SprintOptimizationTypeInfoOp : public ForEachTrackedOptimizationTypeInfoOp
|
|||
Sprint(sp, "},");
|
||||
}
|
||||
|
||||
void operator()(TrackedTypeSite site, const char* mirType) override {
|
||||
void operator()(JS::TrackedTypeSite site, const char* mirType) override {
|
||||
if (startedTypes_) {
|
||||
// Clear trailing ,
|
||||
if ((*sp)[sp->getOffset() - 1] == ',')
|
||||
|
@ -4361,7 +4361,7 @@ class SprintOptimizationTypeInfoOp : public ForEachTrackedOptimizationTypeInfoOp
|
|||
}
|
||||
};
|
||||
|
||||
class SprintOptimizationAttemptsOp : public ForEachTrackedOptimizationAttemptOp
|
||||
class SprintOptimizationAttemptsOp : public JS::ForEachTrackedOptimizationAttemptOp
|
||||
{
|
||||
Sprinter* sp;
|
||||
|
||||
|
@ -4370,7 +4370,7 @@ class SprintOptimizationAttemptsOp : public ForEachTrackedOptimizationAttemptOp
|
|||
: sp(sp)
|
||||
{ }
|
||||
|
||||
void operator()(TrackedStrategy strategy, TrackedOutcome outcome) override {
|
||||
void operator()(JS::TrackedStrategy strategy, JS::TrackedOutcome outcome) override {
|
||||
Sprint(sp, "{\"strategy\":\"%s\",\"outcome\":\"%s\"},",
|
||||
TrackedStrategyString(strategy), TrackedOutcomeString(outcome));
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче