Commits

Andrew Sutherland committed 4f341c1

gcLastBytes is now definitely gone; patch before folding.

I could've sworn that I had already compensated for something very much like
this previously?

Comments (0)

Files changed (3)

+# HG changeset patch
+# Parent b74240fcb02cdb9773434100bacecbdfb3b0d062
+
+diff --git a/js/src/jsprobedefs.cpp b/js/src/jsprobedefs.cpp
+--- a/js/src/jsprobedefs.cpp
++++ b/js/src/jsprobedefs.cpp
+@@ -189,17 +189,6 @@
+ }
+ 
+ bool
+-compartment_gcLastBytes(JSRuntime *rt, ProbeValue *arg)
+-{
+-    JS_ASSERT(arg);
+-    JS_ASSERT(arg->ty == ProbeType_JSCompartmentPtr);
+-    JS_ASSERT(arg->data.as_JSCompartmentPtr);
+-    PROBE_VALUE_SET(arg, size_t, arg->data.as_JSCompartmentPtr->gcLastBytes);
+-    return true;
+-}
+-
+-
+-bool
+ compartment_id(JSRuntime *rt, ProbeValue *arg)
+ {
+     JS_ASSERT(arg);
+@@ -209,7 +198,6 @@
+     return true;
+ }
+ 
+-
+ bool
+ env_currentTimeMS(JSRuntime *rt, ProbeValue *arg)
+ {
+diff --git a/js/src/jsprobedefs.h b/js/src/jsprobedefs.h
+--- a/js/src/jsprobedefs.h
++++ b/js/src/jsprobedefs.h
+@@ -153,7 +153,6 @@
+ bool compartment_runtime(JSRuntime *rt, ProbeValue *val);
+ bool compartment_gcBytes(JSRuntime *rt, ProbeValue *val);
+ bool compartment_gcTriggerBytes(JSRuntime *rt, ProbeValue *val);
+-bool compartment_gcLastBytes(JSRuntime *rt, ProbeValue *val);
+ bool compartment_id(JSRuntime *rt, ProbeValue *val);
+ bool env_currentTimeMS(JSRuntime *rt, ProbeValue *val);
+ bool env_currentTimeUS(JSRuntime *rt, ProbeValue *val);
+diff --git a/js/src/jsprobes.tbl b/js/src/jsprobes.tbl
+--- a/js/src/jsprobes.tbl
++++ b/js/src/jsprobes.tbl
+@@ -200,12 +200,11 @@
+ PROBE_TRANS(compartment_runtime,           runtime,            4,  JSCompartmentPtr,    JSRuntimePtr)
+ PROBE_TRANS(compartment_gcBytes,           gcBytes,            5,  JSCompartmentPtr,    size_t)
+ PROBE_TRANS(compartment_gcTriggerBytes,    gcTriggerBytes,     6,  JSCompartmentPtr,    size_t)
+-PROBE_TRANS(compartment_gcLastBytes,       gcLastBytes,        7,  JSCompartmentPtr,    size_t)
+-PROBE_TRANS(compartment_id,                id,                 8,  JSCompartmentPtr,    intptr_t)
+-PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      9,  DummyGlobal,         double)
+-PROBE_TRANS(env_currentTimeUS,             currentTimeUS,     10,  DummyGlobal,         double)
+-PROBE_TRANS(env_threadId,                  threadId,          11,  DummyGlobal,         intptr_t)
+-PROBE_TRANS(context_to_compartment,        compartment,       12,  JSContextPtr,        JSCompartmentPtr)
++PROBE_TRANS(compartment_id,                id,                 7,  JSCompartmentPtr,    intptr_t)
++PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      8,  DummyGlobal,         double)
++PROBE_TRANS(env_currentTimeUS,             currentTimeUS,      9,  DummyGlobal,         double)
++PROBE_TRANS(env_threadId,                  threadId,          10,  DummyGlobal,         intptr_t)
++PROBE_TRANS(context_to_compartment,        compartment,       11,  JSContextPtr,        JSCompartmentPtr)
+ 
+ /* teardown PROBE_POINT helpers */
+ #undef _NO_ARGS

provide-all-compartment-ptrs

 # HG changeset patch
-# Parent 8f1b95652662b6225895149203a10e6b238c9c07
+# Parent 2042831990fe212e719f32ec1ea3090326776197
 
 diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
 --- a/js/xpconnect/src/XPCJSRuntime.cpp
 +++ b/js/xpconnect/src/XPCJSRuntime.cpp
-@@ -1232,13 +1232,13 @@
-                     name->AppendLiteral(", ");
-                     name->Append(compartmentPrivate->location);
-                 }
-+            }
- 
--                if (getAddress) {
--                    // ample; 64-bit address max is 18 chars
--                    static const int maxLength = 31;
--                    nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
--                    name->Append(address);
--                }
-+            if (getAddress) {
-+                // ample; 64-bit address max is 18 chars
-+                static const int maxLength = 31;
-+                nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
-+                name->Append(address);
+@@ -1241,13 +1241,13 @@
+                 name.AppendLiteral(", ");
+                 name.Append(compartmentPrivate->location);
              }
- 
-             // A hack: replace forward slashes with '\\' so they aren't
++        }
+             
+-            if (getAddress) {
+-                // ample; 64-bit address max is 18 chars
+-                const int maxLength = 31;
+-                nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
+-                name.Append(address);
+-            }
++        if (getAddress) {
++            // ample; 64-bit address max is 18 chars
++            const int maxLength = 31;
++            nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
++            name.Append(address);
+         }
+         
+         // A hack: replace forward slashes with '\\' so they aren't
 js-run-probes
 provide-all-compartment-ptrs
 jetpack-scriptcontext-naked-jscontext
+gclast-core-fix