Merge m-c to inbound on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 01 Mar 2013 18:43:05 -0500
changeset 123503 3362afba690edb3b405be1c9573de511613994ec
parent 123502 e067a8b6b4b151fe1e78c15deedbadf0fa852d62 (current diff)
parent 123436 88c693a603a8ce88d1a863da980e2977d753d613 (diff)
child 123504 e9d4487af28dfd6bda302ebb3d114797c9416d46
child 123506 008743f80cb126ed6b964b7917fee01898eea3d1
push id24382
push userryanvm@gmail.com
push dateFri, 01 Mar 2013 23:43:19 +0000
treeherdermozilla-central@3362afba690e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone22.0a1
first release with
nightly linux32
3362afba690e / 22.0a1 / 20130302030852 / files
nightly linux64
3362afba690e / 22.0a1 / 20130302030852 / files
nightly mac
3362afba690e / 22.0a1 / 20130302030852 / files
nightly win32
3362afba690e / 22.0a1 / 20130302030852 / files
nightly win64
3362afba690e / 22.0a1 / 20130302030852 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound on a CLOSED TREE.
--- a/js/src/ion/Snapshots.cpp
+++ b/js/src/ion/Snapshots.cpp
@@ -129,25 +129,16 @@ SnapshotReader::readSnapshotHeader()
 }
 
 void
 SnapshotReader::readFrameHeader()
 {
     JS_ASSERT(moreFrames());
     JS_ASSERT(slotsRead_ == slotCount_);
 
-#ifdef DEBUG
-    union {
-        RawScript script;
-        uint8_t bytes[sizeof(RawScript)];
-    } u;
-    for (size_t i = 0; i < sizeof(RawScript); i++)
-        u.bytes[i] = reader_.readByte();
-#endif
-
     pcOffset_ = reader_.readUnsigned();
     slotCount_ = reader_.readUnsigned();
     IonSpew(IonSpew_Snapshots, "Read pc offset %u, nslots %u", pcOffset_, slotCount_);
 
 #ifdef TRACK_SNAPSHOTS
     pcOpcode_  = reader_.readUnsigned();
     mirOpcode_ = reader_.readUnsigned();
     mirId_     = reader_.readUnsigned();
@@ -314,26 +305,16 @@ SnapshotWriter::startFrame(JSFunction *f
     uint32_t formalArgs = CountArgSlots(fun);
 
     nslots_ = formalArgs + script->nfixed + exprStack;
     slotsWritten_ = 0;
 
     IonSpew(IonSpew_Snapshots, "Starting frame; formals %u, fixed %u, exprs %u",
             formalArgs, script->nfixed, exprStack);
 
-#ifdef DEBUG
-    union {
-        RawScript script;
-        uint8_t bytes[sizeof(RawScript)];
-    } u;
-    u.script = script;
-    for (size_t i = 0; i < sizeof(RawScript); i++)
-        writer_.writeByte(u.bytes[i]);
-#endif
-
     JS_ASSERT(script->code <= pc && pc <= script->code + script->length);
 
     uint32_t pcoff = uint32_t(pc - script->code);
     IonSpew(IonSpew_Snapshots, "Writing pc offset %u, nslots %u", pcoff, nslots_);
     writer_.writeUnsigned(pcoff);
     writer_.writeUnsigned(nslots_);
 }