Changeset 170399 in webkit
- Timestamp:
- Jun 24, 2014 4:16:37 PM (10 years ago)
- Location:
- branches/ftlopt/Source
- Files:
-
- 1 deleted
- 10 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/ftlopt/Source/JavaScriptCore/CMakeLists.txt
r170382 r170399 104 104 105 105 debugger/Debugger.cpp 106 debugger/DebuggerActivation.cpp107 106 debugger/DebuggerCallFrame.cpp 107 debugger/DebuggerScope.cpp 108 108 109 109 dfg/DFGAbstractHeap.cpp -
branches/ftlopt/Source/JavaScriptCore/ChangeLog
r170383 r170399 1 2014-06-24 Mark Lam <mark.lam@apple.com> 2 3 [ftlopt] Renamed DebuggerActivation to DebuggerScope. 4 <https://webkit.org/b/134273> 5 6 Reviewed by Michael Saboff. 7 8 * CMakeLists.txt: 9 * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: 10 * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: 11 * JavaScriptCore.xcodeproj/project.pbxproj: 12 * debugger/DebuggerActivation.cpp: Removed. 13 * debugger/DebuggerActivation.h: Removed. 14 * debugger/DebuggerScope.cpp: Copied from ../../trunk/Source/JavaScriptCore/debugger/DebuggerActivation.cpp. 15 (JSC::DebuggerScope::DebuggerScope): 16 (JSC::DebuggerScope::finishCreation): 17 (JSC::DebuggerScope::visitChildren): 18 (JSC::DebuggerScope::className): 19 (JSC::DebuggerScope::getOwnPropertySlot): 20 (JSC::DebuggerScope::put): 21 (JSC::DebuggerScope::deleteProperty): 22 (JSC::DebuggerScope::getOwnPropertyNames): 23 (JSC::DebuggerScope::defineOwnProperty): 24 (JSC::DebuggerActivation::DebuggerActivation): Deleted. 25 (JSC::DebuggerActivation::finishCreation): Deleted. 26 (JSC::DebuggerActivation::visitChildren): Deleted. 27 (JSC::DebuggerActivation::className): Deleted. 28 (JSC::DebuggerActivation::getOwnPropertySlot): Deleted. 29 (JSC::DebuggerActivation::put): Deleted. 30 (JSC::DebuggerActivation::deleteProperty): Deleted. 31 (JSC::DebuggerActivation::getOwnPropertyNames): Deleted. 32 (JSC::DebuggerActivation::defineOwnProperty): Deleted. 33 * debugger/DebuggerScope.h: Copied from ../../trunk/Source/JavaScriptCore/debugger/DebuggerActivation.h. 34 (JSC::DebuggerScope::create): 35 (JSC::DebuggerActivation::create): Deleted. 36 * runtime/VM.cpp: 37 (JSC::VM::VM): 38 * runtime/VM.h: 39 1 40 2014-06-24 Filip Pizlo <fpizlo@apple.com> 2 41 -
branches/ftlopt/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
r170382 r170399 356 356 <ClCompile Include="..\bytecompiler\NodesCodegen.cpp" /> 357 357 <ClCompile Include="..\debugger\Debugger.cpp" /> 358 <ClCompile Include="..\debugger\DebuggerActivation.cpp" />359 358 <ClCompile Include="..\debugger\DebuggerCallFrame.cpp" /> 359 <ClCompile Include="..\debugger\DebuggerScope.cpp" /> 360 360 <ClCompile Include="..\dfg\DFGAbstractHeap.cpp" /> 361 361 <ClCompile Include="..\dfg\DFGAbstractValue.cpp" /> … … 907 907 <ClInclude Include="..\debugger\Breakpoint.h" /> 908 908 <ClInclude Include="..\debugger\Debugger.h" /> 909 <ClInclude Include="..\debugger\DebuggerActivation.h" />910 909 <ClInclude Include="..\debugger\DebuggerCallFrame.h" /> 911 910 <ClInclude Include="..\debugger\DebuggerPrimitives.h" /> 911 <ClInclude Include="..\debugger\DebuggerScope.h" /> 912 912 <ClInclude Include="..\dfg\DFGAbstractHeap.h" /> 913 913 <ClInclude Include="..\dfg\DFGAbstractInterpreter.h" /> -
branches/ftlopt/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
r168178 r170399 208 208 <Filter>debugger</Filter> 209 209 </ClCompile> 210 <ClCompile Include="..\debugger\Debugger Activation.cpp">210 <ClCompile Include="..\debugger\DebuggerCallFrame.cpp"> 211 211 <Filter>debugger</Filter> 212 212 </ClCompile> 213 <ClCompile Include="..\debugger\Debugger CallFrame.cpp">213 <ClCompile Include="..\debugger\DebuggerScope.cpp"> 214 214 <Filter>debugger</Filter> 215 215 </ClCompile> … … 1647 1647 <Filter>debugger</Filter> 1648 1648 </ClInclude> 1649 <ClInclude Include="..\debugger\DebuggerActivation.h">1650 <Filter>debugger</Filter>1651 </ClInclude>1652 1649 <ClInclude Include="..\debugger\DebuggerCallFrame.h"> 1653 1650 <Filter>debugger</Filter> 1654 1651 </ClInclude> 1655 1652 <ClInclude Include="..\debugger\DebuggerPrimitives.h"> 1653 <Filter>debugger</Filter> 1654 </ClInclude> 1655 <ClInclude Include="..\debugger\DebuggerScope.h"> 1656 1656 <Filter>debugger</Filter> 1657 1657 </ClInclude> -
branches/ftlopt/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r170382 r170399 1958 1958 BC257DE80E1F51C50016B6C9 /* Arguments.h in Headers */ = {isa = PBXBuildFile; fileRef = BC257DE60E1F51C50016B6C9 /* Arguments.h */; }; 1959 1959 BC3046070E1F497F003232CF /* Error.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3046060E1F497F003232CF /* Error.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1960 BC3135640F302FA3003DFD3A /* Debugger Activation.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3135620F302FA3003DFD3A /* DebuggerActivation.h */; settings = {ATTRIBUTES = (Private, ); }; };1961 BC3135650F302FA3003DFD3A /* Debugger Activation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3135630F302FA3003DFD3A /* DebuggerActivation.cpp */; };1960 BC3135640F302FA3003DFD3A /* DebuggerScope.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3135620F302FA3003DFD3A /* DebuggerScope.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1961 BC3135650F302FA3003DFD3A /* DebuggerScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3135630F302FA3003DFD3A /* DebuggerScope.cpp */; }; 1962 1962 BC6AAAE50E1F426500AD87D8 /* ClassInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1963 1963 BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */; }; … … 3575 3575 BC2680E60E16D52300A06E92 /* NumberConstructor.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberConstructor.lut.h; sourceTree = "<group>"; }; 3576 3576 BC3046060E1F497F003232CF /* Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Error.h; sourceTree = "<group>"; }; 3577 BC3135620F302FA3003DFD3A /* Debugger Activation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerActivation.h; sourceTree = "<group>"; };3578 BC3135630F302FA3003DFD3A /* Debugger Activation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerActivation.cpp; sourceTree = "<group>"; };3577 BC3135620F302FA3003DFD3A /* DebuggerScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerScope.h; sourceTree = "<group>"; }; 3578 BC3135630F302FA3003DFD3A /* DebuggerScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerScope.cpp; sourceTree = "<group>"; }; 3579 3579 BC337BDE0E1AF0B80076918A /* GetterSetter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetterSetter.h; sourceTree = "<group>"; }; 3580 3580 BC337BEA0E1B00CB0076918A /* Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Error.cpp; sourceTree = "<group>"; }; … … 4413 4413 F692A8580255597D01FF60F7 /* Debugger.cpp */, 4414 4414 F692A8590255597D01FF60F7 /* Debugger.h */, 4415 BC3135630F302FA3003DFD3A /* DebuggerActivation.cpp */,4416 BC3135620F302FA3003DFD3A /* DebuggerActivation.h */,4417 4415 149559ED0DDCDDF700648087 /* DebuggerCallFrame.cpp */, 4418 4416 1480DB9B0DDC227F003CFDF2 /* DebuggerCallFrame.h */, 4419 4417 FEA0861F182B7A0400F6D851 /* DebuggerPrimitives.h */, 4418 BC3135630F302FA3003DFD3A /* DebuggerScope.cpp */, 4419 BC3135620F302FA3003DFD3A /* DebuggerScope.h */, 4420 4420 ); 4421 4421 path = debugger; … … 6001 6001 BCD203E80E1718F4002C7E82 /* DatePrototype.lut.h in Headers */, 6002 6002 BC18C3FA0E16F5CD00B34460 /* Debugger.h in Headers */, 6003 BC3135640F302FA3003DFD3A /* DebuggerActivation.h in Headers */,6004 6003 BC18C3FB0E16F5CD00B34460 /* DebuggerCallFrame.h in Headers */, 6005 6004 FEA08621182B7A0400F6D851 /* DebuggerPrimitives.h in Headers */, 6005 BC3135640F302FA3003DFD3A /* DebuggerScope.h in Headers */, 6006 6006 0F136D4D174AD69E0075B354 /* DeferGC.h in Headers */, 6007 6007 0FC712DF17CD877C008CC93C /* DeferredCompilationCallback.h in Headers */, … … 7601 7601 147F39C6107EC37600427A48 /* DatePrototype.cpp in Sources */, 7602 7602 14280823107EC02C0013E7B2 /* Debugger.cpp in Sources */, 7603 BC3135650F302FA3003DFD3A /* DebuggerActivation.cpp in Sources */,7604 7603 149559EE0DDCDDF700648087 /* DebuggerCallFrame.cpp in Sources */, 7604 BC3135650F302FA3003DFD3A /* DebuggerScope.cpp in Sources */, 7605 7605 2A7A58EF1808A4C40020BDF7 /* DeferGC.cpp in Sources */, 7606 7606 0FC712DE17CD8779008CC93C /* DeferredCompilationCallback.cpp in Sources */, -
branches/ftlopt/Source/JavaScriptCore/debugger/DebuggerScope.cpp
r170392 r170399 1 1 /* 2 * Copyright (C) 2008 , 2009Apple Inc. All rights reserved.2 * Copyright (C) 2008-2009, 2014 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #include "config.h" 27 #include "Debugger Activation.h"27 #include "DebuggerScope.h" 28 28 29 29 #include "JSActivation.h" … … 32 32 namespace JSC { 33 33 34 STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(Debugger Activation);34 STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(DebuggerScope); 35 35 36 const ClassInfo Debugger Activation::s_info = { "DebuggerActivation", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(DebuggerActivation) };36 const ClassInfo DebuggerScope::s_info = { "DebuggerScope", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(DebuggerScope) }; 37 37 38 Debugger Activation::DebuggerActivation(VM& vm)39 : JSNonFinalObject(vm, vm.debugger ActivationStructure.get())38 DebuggerScope::DebuggerScope(VM& vm) 39 : JSNonFinalObject(vm, vm.debuggerScopeStructure.get()) 40 40 { 41 41 } 42 42 43 void Debugger Activation::finishCreation(VM& vm, JSObject* activation)43 void DebuggerScope::finishCreation(VM& vm, JSObject* activation) 44 44 { 45 45 Base::finishCreation(vm); … … 49 49 } 50 50 51 void Debugger Activation::visitChildren(JSCell* cell, SlotVisitor& visitor)51 void DebuggerScope::visitChildren(JSCell* cell, SlotVisitor& visitor) 52 52 { 53 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(cell);53 DebuggerScope* thisObject = jsCast<DebuggerScope*>(cell); 54 54 ASSERT_GC_OBJECT_INHERITS(thisObject, info()); 55 55 COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag); … … 60 60 } 61 61 62 String Debugger Activation::className(const JSObject* object)62 String DebuggerScope::className(const JSObject* object) 63 63 { 64 const Debugger Activation* thisObject = jsCast<const DebuggerActivation*>(object);64 const DebuggerScope* thisObject = jsCast<const DebuggerScope*>(object); 65 65 return thisObject->m_activation->methodTable()->className(thisObject->m_activation.get()); 66 66 } 67 67 68 bool Debugger Activation::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)68 bool DebuggerScope::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot) 69 69 { 70 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(object);70 DebuggerScope* thisObject = jsCast<DebuggerScope*>(object); 71 71 return thisObject->m_activation->methodTable()->getOwnPropertySlot(thisObject->m_activation.get(), exec, propertyName, slot); 72 72 } 73 73 74 void Debugger Activation::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)74 void DebuggerScope::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot) 75 75 { 76 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(cell);76 DebuggerScope* thisObject = jsCast<DebuggerScope*>(cell); 77 77 thisObject->m_activation->methodTable()->put(thisObject->m_activation.get(), exec, propertyName, value, slot); 78 78 } 79 79 80 bool Debugger Activation::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)80 bool DebuggerScope::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName) 81 81 { 82 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(cell);82 DebuggerScope* thisObject = jsCast<DebuggerScope*>(cell); 83 83 return thisObject->m_activation->methodTable()->deleteProperty(thisObject->m_activation.get(), exec, propertyName); 84 84 } 85 85 86 void Debugger Activation::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)86 void DebuggerScope::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode) 87 87 { 88 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(object);88 DebuggerScope* thisObject = jsCast<DebuggerScope*>(object); 89 89 thisObject->m_activation->methodTable()->getPropertyNames(thisObject->m_activation.get(), exec, propertyNames, mode); 90 90 } 91 91 92 bool Debugger Activation::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool shouldThrow)92 bool DebuggerScope::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool shouldThrow) 93 93 { 94 Debugger Activation* thisObject = jsCast<DebuggerActivation*>(object);94 DebuggerScope* thisObject = jsCast<DebuggerScope*>(object); 95 95 return thisObject->m_activation->methodTable()->defineOwnProperty(thisObject->m_activation.get(), exec, propertyName, descriptor, shouldThrow); 96 96 } -
branches/ftlopt/Source/JavaScriptCore/debugger/DebuggerScope.h
r170392 r170399 1 1 /* 2 * Copyright (C) 2008 , 2009Apple Inc. All rights reserved.2 * Copyright (C) 2008-2009, 2014 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #ifndef Debugger Activation_h27 #define Debugger Activation_h26 #ifndef DebuggerScope_h 27 #define DebuggerScope_h 28 28 29 29 #include "JSObject.h" … … 31 31 namespace JSC { 32 32 33 class Debugger Activation: public JSNonFinalObject {33 class DebuggerScope : public JSNonFinalObject { 34 34 public: 35 35 typedef JSNonFinalObject Base; 36 36 37 static Debugger Activation* create(VM& vm, JSObject* object)37 static DebuggerScope* create(VM& vm, JSObject* object) 38 38 { 39 Debugger Activation* activation = new (NotNull, allocateCell<DebuggerActivation>(vm.heap)) DebuggerActivation(vm);39 DebuggerScope* activation = new (NotNull, allocateCell<DebuggerScope>(vm.heap)) DebuggerScope(vm); 40 40 activation->finishCreation(vm, object); 41 41 return activation; … … 63 63 64 64 private: 65 JS_EXPORT_PRIVATE Debugger Activation(VM&);65 JS_EXPORT_PRIVATE DebuggerScope(VM&); 66 66 WriteBarrier<JSActivation> m_activation; 67 67 }; … … 69 69 } // namespace JSC 70 70 71 #endif // Debugger Activation_h71 #endif // DebuggerScope_h -
branches/ftlopt/Source/JavaScriptCore/runtime/VM.cpp
r166876 r170399 40 40 #include "DFGLongLivedState.h" 41 41 #include "DFGWorklist.h" 42 #include "Debugger Activation.h"42 #include "DebuggerScope.h" 43 43 #include "ErrorInstance.h" 44 44 #include "FTLThunks.h" … … 252 252 structureStructure.set(*this, Structure::createStructure(*this)); 253 253 structureRareDataStructure.set(*this, StructureRareData::createStructure(*this, 0, jsNull())); 254 debugger ActivationStructure.set(*this, DebuggerActivation::createStructure(*this, 0, jsNull()));254 debuggerScopeStructure.set(*this, DebuggerScope::createStructure(*this, 0, jsNull())); 255 255 terminatedExecutionErrorStructure.set(*this, TerminatedExecutionError::createStructure(*this, 0, jsNull())); 256 256 stringStructure.set(*this, JSString::createStructure(*this, 0, jsNull())); -
branches/ftlopt/Source/JavaScriptCore/runtime/VM.h
r167605 r170399 257 257 Strong<Structure> structureStructure; 258 258 Strong<Structure> structureRareDataStructure; 259 Strong<Structure> debugger ActivationStructure;259 Strong<Structure> debuggerScopeStructure; 260 260 Strong<Structure> terminatedExecutionErrorStructure; 261 261 Strong<Structure> stringStructure; -
branches/ftlopt/Source/WebCore/ChangeLog
r168514 r170399 1 2014-06-24 Mark Lam <mark.lam@apple.com> 2 3 [ftlopt] Renamed DebuggerActivation to DebuggerScope. 4 <https://webkit.org/b/134273> 5 6 Reviewed by Michael Saboff. 7 8 No new tests. 9 10 * ForwardingHeaders/debugger/DebuggerActivation.h: Removed. 11 - Removed because this is not used. 12 1 13 2014-05-08 Simon Fraser <simon.fraser@apple.com> 2 14 -
branches/ftlopt/Source/WebKit/mac/ChangeLog
r168512 r170399 1 2014-06-24 Mark Lam <mark.lam@apple.com> 2 3 [ftlopt] Renamed DebuggerActivation to DebuggerScope. 4 <https://webkit.org/b/134273> 5 6 Reviewed by Michael Saboff. 7 8 * WebView/WebScriptDebugDelegate.mm: 9 - Removed unneeded #include. 10 1 11 2014-05-08 Jer Noble <jer.noble@apple.com> 2 12 -
branches/ftlopt/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm
r165676 r170399 38 38 #import <WebCore/runtime_root.h> 39 39 #import <debugger/Debugger.h> 40 #import <debugger/DebuggerActivation.h>41 40 #import <interpreter/CallFrame.h> 42 41 #import <runtime/Completion.h>
Note: See TracChangeset
for help on using the changeset viewer.