Version 4.9.385.18 (cherry-pick)

GeorgNeis · Commit bot · commit 1ecba0fe0407 · 2016-02-04T10:59:49.000Z
Merged a973f73 Expect JSReceiver in Runtime_DeleteLookupSlot, not just JSObject. BUG=chromium:583260 LOG=N R=hablich@chromium.org NOTRY=true NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1666803003 Cr-Commit-Position: refs/branch-heads/4.9@{#23} Cr-Branched-From: 2fea296-refs/heads/4.9.385@{#1} Cr-Branched-From: 0c1430a-refs/heads/master@{#33306}
diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 9
 #define V8_BUILD_NUMBER 385
-#define V8_PATCH_LEVEL 17
+#define V8_PATCH_LEVEL 18
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc
@@ -981,10 +981,10 @@ RUNTIME_FUNCTION(Runtime_DeleteLookupSlot) {
     return isolate->heap()->false_value();
   }
 
-  // The slot was found in a JSObject, either a context extension object,
+  // The slot was found in a JSReceiver, either a context extension object,
   // the global object, or the subject of a with.  Try to delete it
   // (respecting DONT_DELETE).
-  Handle<JSObject> object = Handle<JSObject>::cast(holder);
+  Handle<JSReceiver> object = Handle<JSReceiver>::cast(holder);
   Maybe<bool> result = JSReceiver::DeleteProperty(object, name);
   MAYBE_RETURN(result, isolate->heap()->exception());
   return isolate->heap()->ToBoolean(result.FromJust());
diff --git a/test/mjsunit/regress/regress-583260.js b/test/mjsunit/regress/regress-583260.js
@@ -0,0 +1,12 @@
+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+__v_1 = {
+  has() { return true }
+};
+__v_2 = new Proxy({}, __v_1);
+function __f_5(object) {
+  with (object) { return delete __v_3; }
+}
+ __f_5(__v_2)
