summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2018-05-31 14:22:14 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-07 15:50:32 +0200
commitf3657d6b4d4b30574a43a886bed6945590bf1508 (patch)
treeb004fbba39c432d0306f932f9d3aab883f807559
parentc631245c9c387850b9a0c0184135d9fa27aaef15 (diff)
downloadUXP-f3657d6b4d4b30574a43a886bed6945590bf1508.tar
UXP-f3657d6b4d4b30574a43a886bed6945590bf1508.tar.gz
UXP-f3657d6b4d4b30574a43a886bed6945590bf1508.tar.lz
UXP-f3657d6b4d4b30574a43a886bed6945590bf1508.tar.xz
UXP-f3657d6b4d4b30574a43a886bed6945590bf1508.zip
Bug 1464829 - Ensure the recover instruction vector has the expected size.
-rw-r--r--js/src/jit/JitFrameIterator.h2
-rw-r--r--js/src/jit/JitFrames.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index ba5efef6a..3620badbd 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -322,9 +322,7 @@ class RInstructionResults
MOZ_MUST_USE bool init(JSContext* cx, uint32_t numResults);
bool isInitialized() const;
-#ifdef DEBUG
size_t length() const;
-#endif
JitFrameLayout* frame() const;
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index f11f17225..019be46dd 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -1688,13 +1688,11 @@ RInstructionResults::isInitialized() const
return initialized_;
}
-#ifdef DEBUG
size_t
RInstructionResults::length() const
{
return results_->length();
}
-#endif
JitFrameLayout*
RInstructionResults::frame() const
@@ -2150,7 +2148,7 @@ SnapshotIterator::initInstructionResults(MaybeReadFallback& fallback)
}
MOZ_ASSERT(results->isInitialized());
- MOZ_ASSERT(results->length() == recover_.numInstructions() - 1);
+ MOZ_RELEASE_ASSERT(results->length() == recover_.numInstructions() - 1);
instructionResults_ = results;
return true;
}