mozilla-central: changeset 231890:6dfab0f84d52708d4be83453961c4fea1050e60a

author	Hannes Verschore <hv1989@gmail.com>
	Wed, 04 Mar 2015 16:17:27 +0100
changeset 231890	6dfab0f84d52708d4be83453961c4fea1050e60a
parent 231889	b06982ec6797d8351b9ec8bc6103cbb599acd5e8
child 231891	ec41cc2959b5889310a1b499f7790bfb7c2b5cae
push id	28362
push user	ryanvm@gmail.com
push date	Wed, 04 Mar 2015 21:35:51 +0000
treeherder	mozilla-central@56492f7244a9 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jandem
bugs	1139152
milestone	39.0a1
first release with	nightly linux32 56492f7244a9 / 39.0a1 / 20150305030206 / files nightly linux64 56492f7244a9 / 39.0a1 / 20150305030206 / files nightly mac 56492f7244a9 / 39.0a1 / 20150305030206 / files nightly win32 56492f7244a9 / 39.0a1 / 20150305030206 / files nightly win64 56492f7244a9 / 39.0a1 / 20150305030206 / files
last release without	nightly linux32 c5b90c003be8 / 39.0a1 / 20150304030231 / files nightly linux64 c5b90c003be8 / 39.0a1 / 20150304030231 / files nightly mac c5b90c003be8 / 39.0a1 / 20150304030231 / files nightly win32 c5b90c003be8 / 39.0a1 / 20150304030231 / files nightly win64 c5b90c003be8 / 39.0a1 / 20150304030231 / files

--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -3503,16 +3503,18 @@ IonBuilder::improveTypesAtTypeOfCompare(
         filter.addType(TypeSet::SymbolType(), alloc_->lifoAlloc());
     } else if (constant->toString() == TypeName(JSTYPE_OBJECT, names)) {
         filter.addType(TypeSet::NullType(), alloc_->lifoAlloc());
         if (trueBranch)
             filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
     } else if (constant->toString() == TypeName(JSTYPE_FUNCTION, names)) {
         if (typeOf->inputMaybeCallableOrEmulatesUndefined() && trueBranch)
             filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
+    } else {
+        return true;
     }
 
     TemporaryTypeSet *type;
     if (trueBranch)
         type = TypeSet::intersectSets(&filter, inputTypes, alloc_->lifoAlloc());
     else
         type = TypeSet::removeSet(inputTypes, &filter, alloc_->lifoAlloc());