From 7d2008a7b1ecf290086dcc9f81e634513a3e6681 Mon Sep 17 00:00:00 2001 From: "igor.bukanov%gmail.com" Date: Wed, 17 Jan 2007 11:02:11 +0000 Subject: [PATCH] Bug 364809: Patch from Seno.Aiko@gmail.com to remove no longer used JSContext.jsop_*. r=myself --- js/src/jscntxt.c | 2 -- js/src/jscntxt.h | 8 +++----- js/src/jsscan.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/js/src/jscntxt.c b/js/src/jscntxt.c index 9fdf8a834888..93c8e43d02b1 100644 --- a/js/src/jscntxt.c +++ b/js/src/jscntxt.c @@ -234,8 +234,6 @@ js_NewContext(JSRuntime *rt, size_t stackChunkSize) * done by js_DestroyContext). */ cx->version = JSVERSION_DEFAULT; - cx->jsop_eq = JSOP_EQ; - cx->jsop_ne = JSOP_NE; JS_InitArenaPool(&cx->stackPool, "stack", stackChunkSize, sizeof(jsval)); JS_InitArenaPool(&cx->tempPool, "temp", 1024, sizeof(jsdouble)); diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h index 041ef3677df9..f513415f18dc 100644 --- a/js/src/jscntxt.h +++ b/js/src/jscntxt.h @@ -655,11 +655,6 @@ struct JSContext { /* Limit pointer for checking stack consumption during recursion. */ jsuword stackLimit; - /* Runtime version control identifier and equality operators. */ - uint16 version; - jsbytecode jsop_eq; - jsbytecode jsop_ne; - /* Data shared by threads in an address space. */ JSRuntime *runtime; @@ -758,6 +753,9 @@ struct JSContext { /* Flag to indicate that we run inside gcCallback(cx, JSGC_MARK_END). */ JSPackedBool insideGCMarkCallback; + /* Runtime version control identifier. */ + uint16 version; + /* Per-context options. */ uint32 options; /* see jsapi.h for JSOPTION_* */ diff --git a/js/src/jsscan.c b/js/src/jsscan.c index 8d2836f579cd..bfeb52993f7f 100644 --- a/js/src/jsscan.c +++ b/js/src/jsscan.c @@ -1581,7 +1581,7 @@ retry: case '=': if (MatchChar(ts, c)) { - tp->t_op = MatchChar(ts, c) ? JSOP_STRICTEQ : (JSOp)cx->jsop_eq; + tp->t_op = MatchChar(ts, c) ? JSOP_STRICTEQ : JSOP_EQ; tt = TOK_EQOP; } else { tp->t_op = JSOP_NOP; @@ -1591,7 +1591,7 @@ retry: case '!': if (MatchChar(ts, '=')) { - tp->t_op = MatchChar(ts, '=') ? JSOP_STRICTNE : (JSOp)cx->jsop_ne; + tp->t_op = MatchChar(ts, '=') ? JSOP_STRICTNE : JSOP_NE; tt = TOK_EQOP; } else { tp->t_op = JSOP_NOT;