From 00c948a90a7e941bf0366201b9e0bf4b18ae4cb3 Mon Sep 17 00:00:00 2001 From: Jason Orendorff Date: Thu, 11 Sep 2014 13:01:14 -0500 Subject: [PATCH] Bug 1052491, part 2 - In jsinfer, support symbol jsids. r=bhackett. This should fix symbol-related orange on a CLOSED TREE. --HG-- extra : rebase_source : 2dbdd4ec819c14627c9a5f081c83e4afb56b6d6c extra : amend_source : baed01f715df89f4bef993902d030164b990506f --- js/src/jsinferinlines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h index bf35bfed013f..420a50ca4f14 100644 --- a/js/src/jsinferinlines.h +++ b/js/src/jsinferinlines.h @@ -1192,7 +1192,7 @@ TypeObject::getProperty(ExclusiveContext *cx, jsid id) { JS_ASSERT(cx->compartment()->activeAnalysis); - JS_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id)); + JS_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id) || JSID_IS_SYMBOL(id)); JS_ASSERT_IF(!JSID_IS_EMPTY(id), id == IdToTypeId(id)); JS_ASSERT(!unknownProperties()); @@ -1233,7 +1233,7 @@ TypeObject::getProperty(ExclusiveContext *cx, jsid id) inline HeapTypeSet * TypeObject::maybeGetProperty(jsid id) { - JS_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id)); + JS_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id) || JSID_IS_SYMBOL(id)); JS_ASSERT_IF(!JSID_IS_EMPTY(id), id == IdToTypeId(id)); JS_ASSERT(!unknownProperties());