Fixed compilation with old gcc.

Author: xeioex

src/njs_value.c

@@ -8,8 +8,6 @@
 #include <njs_main.h>
 
 
-static njs_int_t njs_object_property_query(njs_vm_t *vm,
-    njs_property_query_t *pq, njs_object_t *object, uint32_t atom_id);
 static njs_int_t njs_array_property_query(njs_vm_t *vm,
     njs_property_query_t *pq, njs_array_t *array, uint32_t index,
     uint32_t atom_id);
@@ -537,91 +535,6 @@ njs_value_is_data_view(const njs_value_t *value)
 }
 
 
-/*
- * ES5.1, 8.12.1: [[GetOwnProperty]], [[GetProperty]].
- * The njs_property_query() returns values
- *   NJS_OK               property has been found in object,
- *     retval of type njs_object_prop_t * is in pq->lhq.value.
- *     in NJS_PROPERTY_QUERY_GET
- *       prop->type is NJS_PROPERTY or NJS_PROPERTY_HANDLER.
- *     in NJS_PROPERTY_QUERY_SET, NJS_PROPERTY_QUERY_DELETE
- *       prop->type is NJS_PROPERTY, NJS_PROPERTY_REF, NJS_PROPERTY_PLACE_REF,
- *       NJS_PROPERTY_TYPED_ARRAY_REF or
- *       NJS_PROPERTY_HANDLER.
- *   NJS_DECLINED         property was not found in object,
- *     if pq->lhq.value != NULL it contains retval of type
- *     njs_object_prop_t * where prop->type is NJS_WHITEOUT
- *   NJS_ERROR            exception has been thrown.
- */
-
-njs_int_t
-njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *value,
-    uint32_t atom_id)
-{
-    uint32_t        index;
-    njs_int_t       ret;
-    njs_object_t    *obj;
-    njs_function_t  *function;
-
-    njs_assert(atom_id != NJS_ATOM_STRING_unknown);
-
-    switch (value->type) {
-    case NJS_BOOLEAN:
-    case NJS_NUMBER:
-    case NJS_SYMBOL:
-        index = njs_primitive_prototype_index(value->type);
-        obj = njs_vm_proto(vm, index);
-        break;
-
-    case NJS_STRING:
-        if (njs_atom_is_number(atom_id)) {
-            return njs_string_property_query(vm, pq, value,
-                                             njs_atom_number(atom_id));
-        }
-
-        obj = &vm->string_object;
-        break;
-
-    case NJS_OBJECT:
-    case NJS_ARRAY:
-    case NJS_ARRAY_BUFFER:
-    case NJS_DATA_VIEW:
-    case NJS_TYPED_ARRAY:
-    case NJS_REGEXP:
-    case NJS_DATE:
-    case NJS_PROMISE:
-    case NJS_OBJECT_VALUE:
-        obj = njs_object(value);
-        break;
-
-    case NJS_FUNCTION:
-        function = njs_function_value_copy(vm, value);
-        if (njs_slow_path(function == NULL)) {
-            return NJS_ERROR;
-        }
-
-        obj = &function->object;
-        break;
-
-    case NJS_UNDEFINED:
-    case NJS_NULL:
-    default:
-        njs_atom_string_get(vm, atom_id, &pq->lhq.key);
-        njs_type_error(vm, "cannot get property \"%V\" of %s", &pq->lhq.key,
-                       njs_type_string(value->type));
-        return NJS_ERROR;
-    }
-
-    ret = njs_object_property_query(vm, pq, obj, atom_id);
-
-    if (njs_slow_path(ret == NJS_DECLINED && obj->slots != NULL)) {
-        return njs_external_property_query(vm, pq, value);
-    }
-
-    return ret;
-}
-
-
 njs_inline njs_int_t
 njs_object_property_query(njs_vm_t *vm, njs_property_query_t *pq,
     njs_object_t *object, uint32_t atom_id)
@@ -748,6 +661,91 @@ njs_object_property_query(njs_vm_t *vm, njs_property_query_t *pq,
 }
 
 
+/*
+ * ES5.1, 8.12.1: [[GetOwnProperty]], [[GetProperty]].
+ * The njs_property_query() returns values
+ *   NJS_OK               property has been found in object,
+ *     retval of type njs_object_prop_t * is in pq->lhq.value.
+ *     in NJS_PROPERTY_QUERY_GET
+ *       prop->type is NJS_PROPERTY or NJS_PROPERTY_HANDLER.
+ *     in NJS_PROPERTY_QUERY_SET, NJS_PROPERTY_QUERY_DELETE
+ *       prop->type is NJS_PROPERTY, NJS_PROPERTY_REF, NJS_PROPERTY_PLACE_REF,
+ *       NJS_PROPERTY_TYPED_ARRAY_REF or
+ *       NJS_PROPERTY_HANDLER.
+ *   NJS_DECLINED         property was not found in object,
+ *     if pq->lhq.value != NULL it contains retval of type
+ *     njs_object_prop_t * where prop->type is NJS_WHITEOUT
+ *   NJS_ERROR            exception has been thrown.
+ */
+
+njs_int_t
+njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *value,
+    uint32_t atom_id)
+{
+    uint32_t        index;
+    njs_int_t       ret;
+    njs_object_t    *obj;
+    njs_function_t  *function;
+
+    njs_assert(atom_id != NJS_ATOM_STRING_unknown);
+
+    switch (value->type) {
+    case NJS_BOOLEAN:
+    case NJS_NUMBER:
+    case NJS_SYMBOL:
+        index = njs_primitive_prototype_index(value->type);
+        obj = njs_vm_proto(vm, index);
+        break;
+
+    case NJS_STRING:
+        if (njs_atom_is_number(atom_id)) {
+            return njs_string_property_query(vm, pq, value,
+                                             njs_atom_number(atom_id));
+        }
+
+        obj = &vm->string_object;
+        break;
+
+    case NJS_OBJECT:
+    case NJS_ARRAY:
+    case NJS_ARRAY_BUFFER:
+    case NJS_DATA_VIEW:
+    case NJS_TYPED_ARRAY:
+    case NJS_REGEXP:
+    case NJS_DATE:
+    case NJS_PROMISE:
+    case NJS_OBJECT_VALUE:
+        obj = njs_object(value);
+        break;
+
+    case NJS_FUNCTION:
+        function = njs_function_value_copy(vm, value);
+        if (njs_slow_path(function == NULL)) {
+            return NJS_ERROR;
+        }
+
+        obj = &function->object;
+        break;
+
+    case NJS_UNDEFINED:
+    case NJS_NULL:
+    default:
+        njs_atom_string_get(vm, atom_id, &pq->lhq.key);
+        njs_type_error(vm, "cannot get property \"%V\" of %s", &pq->lhq.key,
+                       njs_type_string(value->type));
+        return NJS_ERROR;
+    }
+
+    ret = njs_object_property_query(vm, pq, obj, atom_id);
+
+    if (njs_slow_path(ret == NJS_DECLINED && obj->slots != NULL)) {
+        return njs_external_property_query(vm, pq, value);
+    }
+
+    return ret;
+}
+
+
 static njs_int_t
 njs_array_property_query(njs_vm_t *vm, njs_property_query_t *pq,
     njs_array_t *array, uint32_t index, uint32_t atom_id)

src/njs_vmcode.c

@@ -2591,7 +2591,7 @@ njs_function_frame_create(njs_vm_t *vm, njs_value_t *value,
 }
 
 
-inline njs_object_t *
+njs_object_t *
 njs_function_new_object(njs_vm_t *vm, njs_value_t *constructor)
 {
     njs_value_t     proto, bound;