Remove the P3 operand from OP_IsNull since it was not being used. (CVS 6779)

FossilOrigin-Name: 767ef1e4a1b31abef479368d9f960ecfd6fa08c6

diff --git a/manifest b/manifest
index 4e1e5d3a366e8ab6333e830201f295718810aa38..00270d752fe75aa96d358f9957d761c1c1789eb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\san\sassertion\sfault\sif\san\sout-of-memory\serror\soccurs\swhile\strying\nto\srun\sthe\sstring-concatentation\soperator\son\sa\szero-blob.\s\s(This\sis\san\nabsurd\sthing\sto\sdo,\sbut\seven\sso,\swe\sstill\sshould\snot\sfault.)\s(CVS\s6778)
-D 2009-06-17T22:50:42
+C Remove\sthe\sP3\soperand\sfrom\sOP_IsNull\ssince\sit\swas\snot\sbeing\sused.\s(CVS\s6779)
+D 2009-06-18T00:41:56
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c a7e981e032c3c9c0887d50d7e658a33cb355b43d
 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
-F src/vdbe.c 52863ed40dbec5eeafcb931f0b05245508fe7779
+F src/vdbe.c 09925c462891da6d2efdd68e657f3e072620177e
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h 3727128255a93d116e454f67d4559700f7ae4d6f
 F src/vdbeapi.c 619992b16821b989050e8a12e259d795d30731a9
@@ -736,7 +736,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 3d7327fd6af983d5ce9bc9a2ba869b23c44cc8e6
-R 6687213aa06329895696faa25248eff6
+P 0def0b76b9f4de9ee259ab1cbe71051fd58b73be
+R 1322e72b4dc9de9db623061ba46b85c0
 U drh
-Z dfb46c4da91bb75fbbcc6b09c978a967
+Z 6c3325c9dd99964c6cb9177724f1f76f

diff --git a/manifest.uuid b/manifest.uuid
index b5020824287642ba82985bc8e28b02a9581c7673..7613d20d98579700881699779c8a5495b2ad5989 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0def0b76b9f4de9ee259ab1cbe71051fd58b73be
\ No newline at end of file
+767ef1e4a1b31abef479368d9f960ecfd6fa08c6
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 5e39e9bbdc20669f3291c70253084a893dfccef7..41539f03ccc52663acb48d91dea2ea2b9d5ea58c 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.854 2009/06/17 22:50:42 drh Exp $
+** $Id: vdbe.c,v 1.855 2009/06/18 00:41:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -1931,24 +1931,14 @@ case OP_IfNot: {            /* jump, in1 */
   break;
 }
 
-/* Opcode: IsNull P1 P2 P3 * *
+/* Opcode: IsNull P1 P2 * * *
 **
-** Jump to P2 if the value in register P1 is NULL.  If P3 is greater
-** than zero, then check all values reg(P1), reg(P1+1), 
-** reg(P1+2), ..., reg(P1+P3-1).
+** Jump to P2 if the value in register P1 is NULL.
 */
 case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
-  int n;
-
-  n = pOp->p3;
-  assert( pOp->p3==0 || pOp->p1>0 );
-  do{
-    if( (pIn1->flags & MEM_Null)!=0 ){
-      pc = pOp->p2 - 1;
-      break;
-    }
-    pIn1++;
-  }while( --n > 0 );
+  if( (pIn1->flags & MEM_Null)!=0 ){
+    pc = pOp->p2 - 1;
+  }
   break;
 }