mozilla-inbound: changeset 134143:7df36088f6451bd4f8db0dfa589894abca8e1f78

author	Kannan Vijayan <kvijayan@mozilla.com>
	Wed, 05 Jun 2013 16:42:23 -0400
changeset 134143	7df36088f6451bd4f8db0dfa589894abca8e1f78
parent 134142	72fbfb2f8e51a69e59fb11da6e1a98ea02a8073f
child 134144	01458e7eb7071780e726d8ed65994fbffd7c37ff
push id	29068
push user	kvijayan@mozilla.com
push date	Wed, 05 Jun 2013 20:43:08 +0000
treeherder	mozilla-inbound@7df36088f645 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	h4writer
bugs	877287
milestone	24.0a1
first release with	nightly linux32 dc8e78ed8c44 / 24.0a1 / 20130607031055 / files nightly linux64 dc8e78ed8c44 / 24.0a1 / 20130607031055 / files nightly mac dc8e78ed8c44 / 24.0a1 / 20130607031055 / files nightly win32 dc8e78ed8c44 / 24.0a1 / 20130607031055 / files nightly win64 dc8e78ed8c44 / 24.0a1 / 20130607031055 / files
last release without	nightly linux32 204de5b7e0a6 / 24.0a1 / 20130606031128 / files nightly linux64 204de5b7e0a6 / 24.0a1 / 20130606031128 / files nightly mac 204de5b7e0a6 / 24.0a1 / 20130606031128 / files nightly win32 204de5b7e0a6 / 24.0a1 / 20130606031128 / files nightly win64 204de5b7e0a6 / 24.0a1 / 20130606031128 / files

--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -5256,16 +5256,18 @@ IonBuilder::jsop_initelem_array()
 static bool
 CanEffectlesslyCallLookupGenericOnObject(JSObject *obj)
 {
     while (obj) {
         if (!obj->isNative())
             return false;
         if (obj->getClass()->ops.lookupProperty)
             return false;
+        if (obj->getClass()->resolve != JS_ResolveStub)
+            return false;
         obj = obj->getProto();
     }
     return true;
 }
 
 bool
 IonBuilder::jsop_initprop(HandlePropertyName name)
 {