Changeset 207255 in webkit

Timestamp:

Oct 12, 2016 4:02:01 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r204612. rdar://problem/28216278

Location:

branches/safari-602.2.14.0-branch

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ScopedArguments.h (modified) (2 diffs)

branches/safari-602.2.14.0-branch/JSTests/ChangeLog

@@ +1 @@
+2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r204612. rdar://problem/28216278
+
+    2016-08-18  Mark Lam  <mark.lam@apple.com>
+
+            ScopedArguments is using the wrong owner object for a write barrier.
+            https://bugs.webkit.org/show_bug.cgi?id=160976
+            <rdar://problem/27328506>
+
+            Reviewed by Keith Miller.
+
+            * stress/scoped-arguments-write-barrier-should-be-on-scope-object.js: Added.
+
 2016-09-09  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.2.14.0-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r204612. rdar://problem/28216278
+
+    2016-08-18  Mark Lam  <mark.lam@apple.com>
+
+            ScopedArguments is using the wrong owner object for a write barrier.
+            https://bugs.webkit.org/show_bug.cgi?id=160976
+            <rdar://problem/27328506>
+
+            Reviewed by Keith Miller.
+
+            * runtime/ScopedArguments.h:
+            (JSC::ScopedArguments::setIndexQuickly):
+
 2016-09-14  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/ScopedArguments.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -101 +101 @@
         unsigned namedLength = m_table->length();
         if (i < namedLength)
-            m_scope->variableAt(m_table->get(i)).set(vm, this, value);
+            m_scope->variableAt(m_table->get(i)).set(vm, m_scope.get(), value);
         else
             overflowStorage()[i - namedLength].set(vm, this, value);