Improve error reporting for duplicate object template properties.

BUG=
R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/359413007

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22112 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/apinatives.js b/src/apinatives.js
index 50c753ec70e517aa38b1de60b5d6e02bf3e65b73..0ba5c6838db004f06dde4961470964734f346ad9 100644 (file)
--- a/src/apinatives.js
+++ b/src/apinatives.js
@@ -99,7 +99,7 @@ function ConfigureTemplateInstance(obj, data) {
         var prop_data = properties[i + 2];
         var attributes = properties[i + 3];
         var value = Instantiate(prop_data, name);
-        %AddProperty(obj, name, value, attributes);
+        %AddPropertyForTemplate(obj, name, value, attributes);
       } else if (length == 4 || length == 5) {
         // TODO(verwaest): The 5th value used to be access_control. Remove once
         // the bindings are updated.

diff --git a/src/messages.js b/src/messages.js
index 8f83a62107ee93ecfd00967972cf7f6490b499c1..da373b2dd2d5a8c94e398a8d2d21c89c37f000a9 100644 (file)
--- a/src/messages.js
+++ b/src/messages.js
@@ -26,6 +26,7 @@ var kMessages = {
   newline_after_throw:           ["Illegal newline after throw"],
   label_redeclaration:           ["Label '", "%0", "' has already been declared"],
   var_redeclaration:             ["Identifier '", "%0", "' has already been declared"],
+  duplicate_template_property:   ["Object template has duplicate property '", "%0", "'"],
   no_catch_or_finally:           ["Missing catch or finally after try"],
   unknown_label:                 ["Undefined label '", "%0", "'"],
   uncaught_exception:            ["Uncaught ", "%0"],

diff --git a/src/runtime.cc b/src/runtime.cc
index 339c45d4f607c7d2eb8c4d47f493f873c658b096..37e2fde25674a6871ae98c609ad1847b2beb4de4 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -5339,15 +5339,59 @@ RUNTIME_FUNCTION(Runtime_AddProperty) {
       static_cast<PropertyAttributes>(unchecked_attributes);
 
 #ifdef DEBUG
+  bool duplicate;
   if (key->IsName()) {
     LookupIterator it(object, Handle<Name>::cast(key),
                       LookupIterator::CHECK_OWN_REAL);
     JSReceiver::GetPropertyAttributes(&it);
-    RUNTIME_ASSERT(!it.IsFound());
+    duplicate = it.IsFound();
   } else {
     uint32_t index = 0;
     RUNTIME_ASSERT(key->ToArrayIndex(&index));
-    RUNTIME_ASSERT(!JSReceiver::HasOwnElement(object, index));
+    duplicate = JSReceiver::HasOwnElement(object, index);
+  }
+  RUNTIME_ASSERT(!duplicate);
+#endif
+
+  Handle<Object> result;
+  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+      isolate, result,
+      Runtime::DefineObjectProperty(object, key, value, attributes));
+  return *result;
+}
+
+
+RUNTIME_FUNCTION(Runtime_AddPropertyForTemplate) {
+  HandleScope scope(isolate);
+  RUNTIME_ASSERT(args.length() == 4);
+
+  CONVERT_ARG_HANDLE_CHECKED(JSObject, object, 0);
+  CONVERT_ARG_HANDLE_CHECKED(Object, key, 1);
+  CONVERT_ARG_HANDLE_CHECKED(Object, value, 2);
+  CONVERT_SMI_ARG_CHECKED(unchecked_attributes, 3);
+  RUNTIME_ASSERT(
+      (unchecked_attributes & ~(READ_ONLY | DONT_ENUM | DONT_DELETE)) == 0);
+  // Compute attributes.
+  PropertyAttributes attributes =
+      static_cast<PropertyAttributes>(unchecked_attributes);
+
+#ifdef DEBUG
+  bool duplicate;
+  if (key->IsName()) {
+    LookupIterator it(object, Handle<Name>::cast(key),
+                      LookupIterator::CHECK_OWN_REAL);
+    JSReceiver::GetPropertyAttributes(&it);
+    duplicate = it.IsFound();
+  } else {
+    uint32_t index = 0;
+    RUNTIME_ASSERT(key->ToArrayIndex(&index));
+    duplicate = JSReceiver::HasOwnElement(object, index);
+  }
+  if (duplicate) {
+    Handle<Object> args[1] = { key };
+    Handle<Object> error = isolate->factory()->NewTypeError(
+        "duplicate_template_property", HandleVector(args, 1));
+    return isolate->Throw(*error);
   }
 #endif
 

diff --git a/src/runtime.h b/src/runtime.h
index ebc8598c876fbef46420c4769c5e8750ea9edaeb..f4fe6f7d66833169a0b1ca1ca33473ef40368624 100644 (file)
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -225,6 +225,7 @@ namespace internal {
   F(IsAttachedGlobal, 1, 1) \
   \
   F(AddProperty, 4, 1) \
+  F(AddPropertyForTemplate, 4, 1) \
   F(SetProperty, 4, 1) \
   F(DefineDataPropertyUnchecked, 4, 1) \
   F(DefineAccessorPropertyUnchecked, 5, 1) \

diff --git a/test/mjsunit/runtime-gen/addpropertyfortemplate.js b/test/mjsunit/runtime-gen/addpropertyfortemplate.js
new file mode 100644 (file)
index 0000000..bb8cf36
--- /dev/null
+++ b/test/mjsunit/runtime-gen/addpropertyfortemplate.js
@@ -0,0 +1,8 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// AUTO-GENERATED BY tools/generate-runtime-tests.py, DO NOT MODIFY
+// Flags: --allow-natives-syntax --harmony
+var _object = new Object();
+var arg1 = 10;
+var _value = new Object();
+var _unchecked_attributes = 1;
+%AddPropertyForTemplate(_object, arg1, _value, _unchecked_attributes);

diff --git a/tools/generate-runtime-tests.py b/tools/generate-runtime-tests.py
index f018cf044471eb3eb46470cff3536b64d5e9335b..c6049bf2be712ef8264dcc9581a860584f4d0768 100755 (executable)
--- a/tools/generate-runtime-tests.py
+++ b/tools/generate-runtime-tests.py
@@ -47,8 +47,8 @@ EXPAND_MACROS = [
 # that the parser doesn't bit-rot. Change the values as needed when you add,
 # remove or change runtime functions, but make sure we don't lose our ability
 # to parse them!
-EXPECTED_FUNCTION_COUNT = 416
-EXPECTED_FUZZABLE_COUNT = 331
+EXPECTED_FUNCTION_COUNT = 417
+EXPECTED_FUZZABLE_COUNT = 332
 EXPECTED_CCTEST_COUNT = 6
 EXPECTED_UNKNOWN_COUNT = 4
 EXPECTED_BUILTINS_COUNT = 809
@@ -212,6 +212,7 @@ _NUMBER_FORMAT = (
 # None means "fall back to autodetected value".
 CUSTOM_KNOWN_GOOD_INPUT = {
   "AddProperty": [None, 10, None, None, None],
+  "AddPropertyForTemplate": [None, 10, None, None, None],
   "Apply": ["function() {}", None, None, None, None, None],
   "ArrayBufferSliceImpl": [None, None, 0, None],
   "ArrayConcat": ["[1, 'a']", None],