Backed out changeset a4e0f0475b78 (bug 1212258) for SM(e) orange
authorWes Kocher <wkocher@mozilla.com>
Thu, 08 Oct 2015 10:15:38 -0700
changeset 266966 da767cf4ce869798fc9cf78b8809c9f709248a50
parent 266965 df9bd3a65292788d5b679ff5d8b1e092e538cabd
child 266967 06d223e905d55b79bb46d3777d27623fad32b34a
push id29504
push usercbook@mozilla.com
push dateFri, 09 Oct 2015 09:43:23 +0000
treeherdermozilla-central@d01dd42e654b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1212258
milestone44.0a1
backs outa4e0f0475b789412d8f575661b88a53c9589807d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset a4e0f0475b78 (bug 1212258) for SM(e) orange
js/src/jit-test/tests/ion/bug1212258.js
js/src/jit/Label.h
js/src/jit/arm/Assembler-arm.cpp
deleted file mode 100644
--- a/js/src/jit-test/tests/ion/bug1212258.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// |jit-test| allow-oom;
-function h(f, inputs) {
-    for (var j = 0; j < 99; ++j) {
-        for (var k = 0; k < 99; ++k) {
-            oomAfterAllocations(10)
-        }
-    }
-}
-m = function(y) {};
-h(m, []);
--- a/js/src/jit/Label.h
+++ b/js/src/jit/Label.h
@@ -55,17 +55,17 @@ struct LabelBase
     }
     // Sets the label's latest used position, returning the old use position in
     // the process.
     int32_t use(int32_t offset) {
         MOZ_ASSERT(!bound());
 
         int32_t old = offset_;
         offset_ = offset;
-        MOZ_ASSERT(offset_ == offset, "bitfield overflow");
+        MOZ_ASSERT(offset_ == offset);
 
         return old;
     }
 };
 
 // A label represents a position in an assembly buffer that may or may not have
 // already been generated. Labels can either be "bound" or "unbound", the
 // former meaning that its position is known and the latter that its position
--- a/js/src/jit/arm/Assembler-arm.cpp
+++ b/js/src/jit/arm/Assembler-arm.cpp
@@ -2411,21 +2411,16 @@ Assembler::as_b(Label* l, Condition c)
             return ret;
         }
         ret = as_b(BOffImm(old), c, l);
     } else {
         old = LabelBase::INVALID_OFFSET;
         BOffImm inv;
         ret = as_b(inv, c, l);
     }
-
-    // We might oom while adding more instructions.
-    if (!ret.assigned())
-        return ret;
-
     DebugOnly<int32_t> check = l->use(ret.getOffset());
     MOZ_ASSERT(check == old);
     return ret;
 }
 
 BufferOffset
 Assembler::as_b(BOffImm off, Condition c, BufferOffset inst)
 {