mozilla-central: changeset 166536:dfad58dd98b640ba21974794a97a823c67805039

author	Benjamin Peterson <benjamin@python.org>
	Sat, 01 Feb 2014 21:16:42 -0500
changeset 166536	dfad58dd98b640ba21974794a97a823c67805039
parent 166535	05fd25b6979ef8019400cd2fd8f0385e713d8e76
child 166537	2c83ee786856dff787c68df6724a831b318c44bb
push id	26128
push user	philringnalda@gmail.com
push date	Sun, 02 Feb 2014 17:23:15 +0000
treeherder	mozilla-central@5f88d54c28e0 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Waldo
bugs	966695
milestone	29.0a1
first release with	nightly linux32 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly linux64 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly mac 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly win32 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly win64 44ba69cacd7e / 29.0a1 / 20140203030203 / files
last release without	nightly linux32 d09f9a9f81ae / 29.0a1 / 20140201074923 / files nightly linux64 d09f9a9f81ae / 29.0a1 / 20140201074923 / files nightly mac d09f9a9f81ae / 29.0a1 / 20140201074923 / files nightly win32 d09f9a9f81ae / 29.0a1 / 20140201074923 / files nightly win64 d09f9a9f81ae / 29.0a1 / 20140201074923 / files

--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -5161,17 +5161,17 @@ EmitReturn(ExclusiveContext *cx, Bytecod
     if (Emit1(cx, bce, JSOP_RETURN) < 0)
         return false;
 
     NonLocalExitScope nle(cx, bce);
 
     if (!nle.prepareForNonLocalJump(nullptr))
         return false;
 
-    if (top + JSOP_RETURN_LENGTH != bce->offset()) {
+    if (top + static_cast<ptrdiff_t>(JSOP_RETURN_LENGTH) != bce->offset()) {
         bce->code()[top] = JSOP_SETRVAL;
         if (Emit1(cx, bce, JSOP_RETRVAL) < 0)
             return false;
     }
 
     return true;
 }