Title: [156239] trunk/Source/_javascript_Core
- Revision
- 156239
- Author
- [email protected]
- Date
- 2013-09-21 20:48:26 -0700 (Sat, 21 Sep 2013)
Log Message
Remove the notion that a CallFrame can have a pointer to an InlineCallFrame, since that doesn't happen anymore
https://bugs.webkit.org/show_bug.cgi?id=121753
Reviewed by Darin Adler.
* interpreter/CallFrame.cpp:
(JSC::CallFrame::bytecodeOffsetFromCodeOriginIndex):
* interpreter/CallFrame.h:
* interpreter/Register.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156238 => 156239)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-22 00:31:09 UTC (rev 156238)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-22 03:48:26 UTC (rev 156239)
@@ -1,5 +1,17 @@
2013-09-21 Filip Pizlo <[email protected]>
+ Remove the notion that a CallFrame can have a pointer to an InlineCallFrame, since that doesn't happen anymore
+ https://bugs.webkit.org/show_bug.cgi?id=121753
+
+ Reviewed by Darin Adler.
+
+ * interpreter/CallFrame.cpp:
+ (JSC::CallFrame::bytecodeOffsetFromCodeOriginIndex):
+ * interpreter/CallFrame.h:
+ * interpreter/Register.h:
+
+2013-09-21 Filip Pizlo <[email protected]>
+
Unreviewed, fix the revert.
* dfg/DFGRepatch.cpp:
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (156238 => 156239)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2013-09-22 00:31:09 UTC (rev 156238)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2013-09-22 03:48:26 UTC (rev 156239)
@@ -174,18 +174,6 @@
Register* frameExtentInternal();
-#if ENABLE(DFG_JIT)
- InlineCallFrame* inlineCallFrame() const { return this[JSStack::ReturnPC].asInlineCallFrame(); }
-#else
- // This will never be called if !ENABLE(DFG_JIT) since all calls should be guarded by
- // isInlinedFrame(). But to make it easier to write code without having a bunch of
- // #if's, we make a dummy implementation available anyway.
- InlineCallFrame* inlineCallFrame() const
- {
- RELEASE_ASSERT_NOT_REACHED();
- return 0;
- }
-#endif
#if USE(JSVALUE32_64)
Instruction* currentVPC() const
{
@@ -271,9 +259,6 @@
void setCodeBlock(CodeBlock* codeBlock) { static_cast<Register*>(this)[JSStack::CodeBlock] = codeBlock; }
void setReturnPC(void* value) { static_cast<Register*>(this)[JSStack::ReturnPC] = (Instruction*)value; }
-#if ENABLE(DFG_JIT)
- void setInlineCallFrame(InlineCallFrame* inlineCallFrame) { static_cast<Register*>(this)[JSStack::ReturnPC] = inlineCallFrame; }
-#endif
CallFrame* callerFrameNoFlags() { return callerFrame()->removeHostCallFrameFlag(); }
// CallFrame::iterate() expects a Functor that implements the following method:
Modified: trunk/Source/_javascript_Core/interpreter/Register.h (156238 => 156239)
--- trunk/Source/_javascript_Core/interpreter/Register.h 2013-09-22 00:31:09 UTC (rev 156238)
+++ trunk/Source/_javascript_Core/interpreter/Register.h 2013-09-22 03:48:26 UTC (rev 156239)
@@ -42,7 +42,6 @@
class JSPropertyNameIterator;
class JSScope;
- struct InlineCallFrame;
struct Instruction;
typedef ExecState CallFrame;
@@ -61,7 +60,6 @@
Register& operator=(CodeBlock*);
Register& operator=(JSScope*);
Register& operator=(Instruction*);
- Register& operator=(InlineCallFrame*);
int32_t i() const;
JSActivation* activation() const;
@@ -71,7 +69,6 @@
JSPropertyNameIterator* propertyNameIterator() const;
JSScope* scope() const;
Instruction* vPC() const;
- InlineCallFrame* asInlineCallFrame() const;
int32_t unboxedInt32() const;
int64_t unboxedInt52() const;
bool unboxedBoolean() const;
@@ -96,7 +93,6 @@
CallFrame* callFrame;
CodeBlock* codeBlock;
Instruction* vPC;
- InlineCallFrame* inlineCallFrame;
EncodedValueDescriptor encodedValue;
double number;
int64_t integer;
@@ -151,12 +147,6 @@
return *this;
}
- ALWAYS_INLINE Register& Register::operator=(InlineCallFrame* inlineCallFrame)
- {
- u.inlineCallFrame = inlineCallFrame;
- return *this;
- }
-
ALWAYS_INLINE int32_t Register::i() const
{
return jsValue().asInt32();
@@ -177,11 +167,6 @@
return u.vPC;
}
- ALWAYS_INLINE InlineCallFrame* Register::asInlineCallFrame() const
- {
- return u.inlineCallFrame;
- }
-
ALWAYS_INLINE int32_t Register::unboxedInt32() const
{
return payload();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
