Changeset 10222 in webkit for trunk/JavaScriptCore/kjs

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.

Location:

trunk/JavaScriptCore/kjs

Files:

• fast_malloc.cpp (modified) (2 diffs)
• fast_malloc.h (modified) (5 diffs)
• nodes.cpp (modified) (1 diff)

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 */
 
 /* ------------------------------------------------------------

trunk/JavaScriptCore/kjs/fast_malloc.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -21 +20 @@
  */
 
-
-#ifndef _FAST_MALLOC_H_
-#define _FAST_MALLOC_H_
+#ifndef KJS_FAST_MALLOC_H
+#define KJS_FAST_MALLOC_H
 
 // This is a copy of dlmalloc, a fast single-threaded malloc implementation.
@@ -31 +29 @@
 // executing or GC is taking place).
 
-
-#ifndef NDEBUG
-
-#define kjs_fast_malloc malloc
-#define kjs_fast_calloc calloc
-#define kjs_fast_free free
-#define kjs_fast_realloc realloc
-
-#define KJS_FAST_ALLOCATED
-
-#else
+#include <stdlib.h>
 
 namespace KJS {
@@ -50 +38 @@
 void *kjs_fast_realloc(void* p, size_t n);
 
-};
+}
 
 #define KJS_FAST_ALLOCATED \
@@ -56 +44 @@
 void operator delete(void* p) { KJS::kjs_fast_free(p); }
 
-#endif
-
-#endif /* _FAST_MALLOC_H_ */
+#endif /* KJS_FAST_MALLOC_H */

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -190 +190 @@
 void Node::setExceptionDetailsIfNeeded(ExecState *exec)
 {
-    if (exec->hadException()) {
-        ObjectImp *exception = static_cast<ObjectImp *>(exec->exception());
+    ValueImp *exceptionValue = exec->exception();
+    if (exceptionValue->isObject()) {
+        ObjectImp *exception = static_cast<ObjectImp *>(exceptionValue);
         if (!exception->hasProperty(exec, "line") && !exception->hasProperty(exec, "sourceURL")) {
             exception->put(exec, "line", Number(line));