From 8082b01358cbc546f4502910052d56194aae29e1 Mon Sep 17 00:00:00 2001 From: Sean Stangl Date: Fri, 6 Aug 2010 14:12:57 -0700 Subject: [PATCH] [JAEGER] Correct ic::BindName::disable() return. b=584587, r=dvander. --- js/src/methodjit/PolyIC.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp index e469b4c6efb..a83a396bb12 100644 --- a/js/src/methodjit/PolyIC.cpp +++ b/js/src/methodjit/PolyIC.cpp @@ -1041,8 +1041,8 @@ class GetPropCompiler : public PICStubCompiler if (obj == holder && !pic.inlinePathPatched) return patchInline(holder, sprop); - else - return generateStub(holder, sprop); + + return generateStub(holder, sprop); } bool disable(const char *reason) @@ -1361,8 +1361,8 @@ class GetElemCompiler : public PICStubCompiler if (obj == holder && !pic.inlinePathPatched) return patchInline(holder, sprop); - else - return generateStub(holder, sprop); + + return generateStub(holder, sprop); } bool disable(const char *reason) @@ -1684,10 +1684,9 @@ class BindNameCompiler : public PICStubCompiler stub(JS_FUNC_TO_DATA_PTR(void *, stub)) { } - JSObject *disable(const char *reason) + bool disable(const char *reason) { - PICStubCompiler::disable(reason, stub); - return NULL; + return PICStubCompiler::disable(reason, stub); } static void reset(ic::PICInfo &pic)