source: webkit/trunk/JavaScriptCore/kjs/JSVariableObject.cpp@ 35027

Last change on this file since 35027 was 34946, checked in by [email protected], 17 years ago

Reviewed by Darin.

https://bugs.webkit.org/show_bug.cgi?id=19834
Failed assertion in JavaScriptCore/VM/SegmentedVector.h:82

Creating a global object with a custom prototype resets it twice (wasteful!).
So, addStaticGlobals() was called twice, but JSGlobalObject::reset() didn't reset
the register array.

  • kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::reset): Call setRegisterArray(0, 0).
  • kjs/JSVariableObject.h: Changed registerArray to OwnArrayPtr. Also, added private copy constructor and operator= to ensure that no one attempts to copy this object (for whatever reason, I couldn't make Noncopyable work).
  • kjs/JSGlobalObject.h: (KJS::JSGlobalObject::addStaticGlobals): Allocate registerArray with new[].
  • kjs/JSVariableObject.cpp: (KJS::JSVariableObject::copyRegisterArray): Allocate registerArray with new[]. (KJS::JSVariableObject::setRegisterArray): Avoid hitting an assertion in OwnArrayPtr when "changing" the value from 0 to 0.
  • Property svn:eol-style set to native
File size: 3.6 KB
Line 
1/*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include "config.h"
30#include "JSVariableObject.h"
31
32#include "PropertyNameArray.h"
33#include "PropertyMap.h"
34
35namespace KJS {
36
37bool JSVariableObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
38{
39 if (symbolTable().contains(propertyName.ustring().rep()))
40 return false;
41
42 return JSObject::deleteProperty(exec, propertyName);
43}
44
45void JSVariableObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
46{
47 SymbolTable::const_iterator end = symbolTable().end();
48 for (SymbolTable::const_iterator it = symbolTable().begin(); it != end; ++it) {
49 if (!(it->second.getAttributes() & DontEnum))
50 propertyNames.add(Identifier(exec, it->first.get()));
51 }
52
53 JSObject::getPropertyNames(exec, propertyNames);
54}
55
56bool JSVariableObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
57{
58 SymbolTableEntry entry = symbolTable().get(propertyName.ustring().rep());
59 if (!entry.isNull()) {
60 attributes = entry.getAttributes() | DontDelete;
61 return true;
62 }
63 return JSObject::getPropertyAttributes(exec, propertyName, attributes);
64}
65
66void JSVariableObject::mark()
67{
68 JSObject::mark();
69
70 if (!d->registerArray)
71 return;
72
73 Register* end = d->registerArray.get() + d->registerArraySize;
74 for (Register* it = d->registerArray.get(); it != end; ++it) {
75 JSValue* v = (*it).u.jsValue;
76 if (!v->marked())
77 v->mark();
78 }
79}
80
81bool JSVariableObject::isVariableObject() const
82{
83 return true;
84}
85
86void JSVariableObject::copyRegisterArray(Register* src, size_t count)
87{
88 ASSERT(!d->registerArray);
89
90 Register* registerArray = new Register[count];
91 memcpy(registerArray, src, count * sizeof(Register));
92
93 setRegisterArray(registerArray, count);
94}
95
96void JSVariableObject::setRegisterArray(Register* registerArray, size_t count)
97{
98 if (registerArray != d->registerArray.get())
99 d->registerArray.set(registerArray);
100 d->registerArraySize = count;
101 d->registers = registerArray + count;
102}
103
104} // namespace KJS
Note: See TracBrowser for help on using the repository browser.