commit 3fb3ca8c7ca439d408449a395897395c0faae8d1
author Ben Murdoch <benm@google.com> Fri Dec 02 17:19:32 2011 +0000
committer Ben Murdoch <benm@google.com> Fri Dec 02 17:27:49 2011 +0000
tree 5cb33db083ae7ebe431e2a460fb3806c54531f9c
parent 257744e915dfc84d6d07a6b2accf8402d9ffc708

Upgrade to V8 3.4

Merge 3.4.14.35

Simple merge required updates to makefiles only.

Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978

src/runtime.js

diff --git a/src/runtime.js b/src/runtime.js
index 77b97ae..4b600df 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -354,7 +354,8 @@
   if (!IS_SPEC_OBJECT(x)) {
     throw %MakeTypeError('invalid_in_operator_use', [this, x]);
   }
-  return %_IsNonNegativeSmi(this) ? %HasElement(x, this) : %HasProperty(x, %ToString(this));
+  return %_IsNonNegativeSmi(this) && !%IsJSProxy(x) ?
+    %HasElement(x, this) : %HasProperty(x, %ToString(this));
 }