syg

<<<<<<< HEAD
# ifdef JS_MANUAL_THREADS
    if (char *jsthreads = getenv("JSTHREADS"))
        numWorkers_ = strtol(jsthreads, NULL, 10);
||||||| merged common ancestors
# ifdef DEBUG
    if (char *pathreads = getenv("PATHREADS"))
        numWorkers_ = strtol(pathreads, NULL, 10);
=======
# ifdef DEBUG

syg

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 * vim: set ts=8 sw=4 et tw=99 ft=cpp:
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "vm/ParallelDo.h"

#include "jsapi.h"

syg

static JSBool
Timeout(JSContext *cx, unsigned argc, jsval *vp)
{
    if (argc == 0) {
        JS_SET_RVAL(cx, vp, JS_NumberValue(gTimeoutInterval));
        return true;
    }

    if (argc > 2) {
        JS_ReportError(cx, "Wrong number of arguments");

syg

  "bodyVelocityLoopified": function bodyVelocityLoopified(index) {
    var pos = NBody.private.pos;
    var data = NBody.private.vel;
    
    var deltaTime = NBody.Constant.deltaTime;
    var epsSqr = NBody.Constant.epsSqr;
    var time = NBody.time;

    var shape = data.shape[0];

syg

diff --git a/js/src/ion/MCallOptimize.cpp b/js/src/ion/MCallOptimize.cpp
index 02f4ca5..ae32a22 100644
--- a/js/src/ion/MCallOptimize.cpp
+++ b/js/src/ion/MCallOptimize.cpp
@@ -470,15 +470,23 @@ IonBuilder::inlineMathAbs(CallInfo &callInfo)
     MIRType argType = getInlineArgType(callInfo, 0);
     if (argType != MIRType_Int32 && argType != MIRType_Double)
         return InliningStatus_NotInlined;
-    if (argType != returnType)
-        return InliningStatus_NotInlined;

syg

diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index f20a2f2..0009b47 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -23,7 +23,7 @@ using namespace js;
 using namespace JS;
 
 // Required by PerThreadDataFriendFields::getMainThread()
-JS_STATIC_ASSERT(offsetof(JSRuntime, mainThread) == JS_PERTHREADDATAOFFSET);
+JS_STATIC_ASSERT(offsetof(JSRuntime, mainThread) == PerThreadDataFriendFields::PerThreadDataOffset);

syg

diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index f20a2f2..0009b47 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -23,7 +23,7 @@ using namespace js;
 using namespace JS;
 
 // Required by PerThreadDataFriendFields::getMainThread()
-JS_STATIC_ASSERT(offsetof(JSRuntime, mainThread) == JS_PERTHREADDATAOFFSET);
+JS_STATIC_ASSERT(offsetof(JSRuntime, mainThread) == PerThreadDataFriendFields::PerThreadDataOffset);

syg

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 47060f4..8b2e769 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -738,7 +738,8 @@ js::PerThreadData::PerThreadData(JSRuntime *runtime)
 {}
 
 JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
-  : mainThread(this),
+  : RuntimeFriendFields(&mainThread),

syg

# HG changeset patch
# Parent b857905d82b45456853866330c98b372b14f20db
# User Nicholas D. Matsakis <[email protected]>
Permit multiple ion compilation modes.  This implies the possibility of
multiple ion scripts per JSScript.
* * *
Add abstractions for cases that handle all comp. modes at once.
* * *
split out separate fields for seq, par
* * *

syg

//
// Higher dimensional wrapper with inferred shape for one-dimensional parallel
// arrays.
//

var ParallelMatrix = (function () {
  function leafShape(pa) {
    var row = pa[0];
    if (!(row instanceof ParallelMatrix))
      return [];