From 5322ed040844a9c97c23764650cefc7f0449c18e Mon Sep 17 00:00:00 2001 From: Andreas Gal Date: Sat, 7 Aug 2010 20:01:02 -0700 Subject: [PATCH] JSString::mLengthAndFlags and mChars are not constant (585309, r=apierce). --- js/src/jstracer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index c1d61f6421a..d1feb6ff58e 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -12473,7 +12473,7 @@ TraceRecorder::getStringLength(LIns* str_ins) return addName(lir->ins2ImmI(LIR_rshup, addName(lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mLengthAndFlags), - ACCSET_OTHER, LOAD_CONST), "mLengthAndFlags"), + ACCSET_OTHER), "mLengthAndFlags"), JSString::FLAGS_LENGTH_SHIFT), "length"); } @@ -12482,7 +12482,7 @@ TraceRecorder::getStringChars(LIns* str_ins) { return addName(lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mChars), - ACCSET_OTHER, LOAD_CONST), "chars"); + ACCSET_OTHER), "chars"); } JS_REQUIRES_STACK LIns* @@ -12490,7 +12490,7 @@ TraceRecorder::getCharCodeAt(JSString *str, LIns* str_ins, LIns* idx_ins) { idx_ins = lir->insUI2P(makeNumberInt32(idx_ins)); LIns *length_ins = lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mLengthAndFlags), - ACCSET_OTHER, LOAD_CONST); + ACCSET_OTHER); LIns *br = lir->insBranch(LIR_jt, lir->insEqP_0(lir->ins2(LIR_andp, length_ins, @@ -12515,7 +12515,7 @@ TraceRecorder::getCharAt(JSString *str, LIns* str_ins, LIns* idx_ins) { idx_ins = lir->insUI2P(makeNumberInt32(idx_ins)); LIns *length_ins = lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mLengthAndFlags), - ACCSET_OTHER, LOAD_CONST); + ACCSET_OTHER); LIns *br = lir->insBranch(LIR_jt, lir->insEqP_0(lir->ins2(LIR_andp, length_ins,