Constructor function prototypes should be real functions.

diff --git a/njs/njs_builtin.c b/njs/njs_builtin.c
index a5f4ae7eef7bedac0d0d35df342e666479ed3314..5eef6fa342f72c64b1c7b4e00ec4bfba3cf69078 100644 (file)
--- a/njs/njs_builtin.c
+++ b/njs/njs_builtin.c
@@ -34,6 +34,16 @@ typedef struct {
 } njs_function_init_t;
 
 
+static njs_ret_t
+njs_prototype_function(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
+    njs_index_t unused)
+{
+    vm->retval = njs_value_void;
+
+    return NXT_OK;
+}
+
+
 nxt_int_t
 njs_builtin_objects_create(njs_vm_t *vm)
 {
@@ -75,7 +85,11 @@ njs_builtin_objects_create(njs_vm_t *vm)
         { .object_value = { .value = njs_string(""),
                             .object = { .type = NJS_OBJECT_STRING } } },
 
-        { .object =       { .type = NJS_FUNCTION } },
+        { .function =     { .native = 1,
+                            .args_offset = 1,
+                            .u.native = njs_prototype_function,
+                            .object = { .type = NJS_FUNCTION } } },
+
         { .object =       { .type = NJS_REGEXP } },
 
         { .date =         { .time = NJS_NAN,

diff --git a/njs/njs_vm.h b/njs/njs_vm.h
index adb9da849bb0b404d2e9bc4deef169b361d8816f..b393bb0cfe8e1fe9a6e044813254c6a94574216a 100644 (file)
--- a/njs/njs_vm.h
+++ b/njs/njs_vm.h
@@ -321,12 +321,12 @@ typedef union {
         .type = NJS_FUNCTION,                                                 \
         .truth = 1,                                                           \
         .u.function = & (njs_function_t) {                                    \
-            .object.shared = 1,                                               \
             .native = 1,                                                      \
             .continuation_size = _size,                                       \
             .args_types = { __VA_ARGS__ },                                    \
             .args_offset = 1,                                                 \
             .u.native = _function,                                            \
+            .object = { .type = NJS_FUNCTION, .shared = 1 },                  \
         }                                                                     \
     }                                                                         \
 }

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 5da2cffa9b6677906d85771d8b50e05fa7377dc3..5ee74d0bc88fb0e9b13c504cdab287d8a860978f 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -4288,6 +4288,9 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("({}).constructor === Object"),
       nxt_string("true") },
 
+    { nxt_string("var a = Object.__proto__; a()"),
+      nxt_string("undefined") },
+
     { nxt_string("var a = Array(3); a"),
       nxt_string(",,") },