Changeset 10222 in webkit for trunk/JavaScriptCore/kjs/fast_malloc.cpp

Timestamp:

Aug 16, 2005, 6:00:00 PM (20 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• fixed crash in one of the JavaScript tests (introduced by my throwError change)

• kjs/nodes.cpp: (Node::setExceptionDetailsIfNeeded): Check if the exception is an object before setting the file and line number properties on it. Something to think about in the future -- do we really want to do this on any object that's thrown? How about limiting it to error objects that were created by the JavaScript engine?

• changed kjs_fast_malloc so we don't have two conflicting versions of the same function

• kjs/fast_malloc.h: Took out all the ifdefs from this header.
• kjs/fast_malloc.cpp: Added non-NDEBUG versions of the functions that just call the system malloc, and put the NDEBUG versions in an #else.

File:

• trunk/JavaScriptCore/kjs/fast_malloc.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/fast_malloc.cpp

@@ -225 +225 @@
 */
 
+#include "fast_malloc.h"
+
 namespace KJS {
+
+#ifndef NDEBUG
+
+// In debugging builds, use the system malloc for its debugging features.
+
+void *kjs_fast_malloc(size_t n)
+{
+    return malloc(n);
+}
+
+void *kjs_fast_calloc(size_t n_elements, size_t element_size)
+{
+    return calloc(n_elements, element_size);
+}
+
+void kjs_fast_free(void* p)
+{
+    free(p);
+}
+
+void *kjs_fast_realloc(void* p, size_t n)
+{
+    return realloc(p, n);
+}
+
+#else
 
 /*
@@ -5414 +5442 @@
 #endif /* WIN32 */
 
-};  /* end of namespace KJS */
+#endif
+
+}  /* end of namespace KJS */
 
 /* ------------------------------------------------------------