Changeset 178693 in webkit for trunk/Source/JavaScriptCore/jit

Timestamp:

Jan 19, 2015, 9:01:26 PM (10 years ago)

Author:

[email protected]

Message:

ClosureCallStubRoutine no longer needs codeOrigin
​https://bugs.webkit.org/show_bug.cgi?id=140659

Reviewed by Michael Saboff.

Once upon a time, we would look for the CodeOrigin associated with a return PC. This search
would start with the CodeBlock according to the caller frame's call frame header. But if the
call was a closure call, the return PC would be inside some closure call stub. So if the
CodeBlock search failed, we would search *all* closure call stub routines to see which one
encompasses the return PC. Then, we would use the CodeOrigin stored in the stub routine
object. This was all a bunch of madness, and we actually got rid of it - we now determine
the CodeOrigin for a call frame using the encoded code origin bits inside the tag of the
argument count.

This patch removes the final vestiges of the madness:

• Remove the totally unused method declaration for the thing that did the closure call stub search.

• Remove the CodeOrigin field from the ClosureCallStubRoutine. Except for that crazy search that we no longer do, everyone else who finds a ClosureCallStubRoutine will find it via the CallLinkInfo. The CallLinkInfo also has the CodeOrigin, so we don't need this field anymore.

• bytecode/CodeBlock.h:
• jit/ClosureCallStubRoutine.cpp:

(JSC::ClosureCallStubRoutine::ClosureCallStubRoutine):

• jit/ClosureCallStubRoutine.h:

(JSC::ClosureCallStubRoutine::executable):
(JSC::ClosureCallStubRoutine::codeOrigin): Deleted.

• jit/Repatch.cpp:

(JSC::linkClosureCall):

Location:

trunk/Source/JavaScriptCore/jit

Files:

• ClosureCallStubRoutine.cpp (modified) (2 diffs)
• ClosureCallStubRoutine.h (modified) (3 diffs)
• Repatch.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/ClosureCallStubRoutine.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 ClosureCallStubRoutine::ClosureCallStubRoutine(
     const MacroAssemblerCodeRef& code, VM& vm, const JSCell* owner,
-    ExecutableBase* executable, const CodeOrigin& codeOrigin)
+    ExecutableBase* executable)
     : GCAwareJITStubRoutine(code, vm)
     , m_executable(vm, owner, executable)
-    , m_codeOrigin(codeOrigin)
 {
 }

trunk/Source/JavaScriptCore/jit/ClosureCallStubRoutine.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38 +38 @@
     ClosureCallStubRoutine(
         const MacroAssemblerCodeRef&, VM&, const JSCell* owner,
-        ExecutableBase*, const CodeOrigin&);
+        ExecutableBase*);
     
     virtual ~ClosureCallStubRoutine();
     
     ExecutableBase* executable() const { return m_executable.get(); }
-    const CodeOrigin& codeOrigin() const { return m_codeOrigin; }
 
 protected:
@@ -50 +49 @@
 private:
     WriteBarrier<ExecutableBase> m_executable;
-    // This allows us to figure out who a call is linked to by searching through
-    // stub routines.
-    CodeOrigin m_codeOrigin;
 };
 

trunk/Source/JavaScriptCore/jit/Repatch.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1732 +1732 @@
                 toCString(*callerCodeBlock).data(), callLinkInfo.callReturnLocation.labelAtOffset(0).executableAddress(),
                 codePtr.executableAddress(), toCString(pointerDump(calleeCodeBlock)).data())),
-        *vm, callerCodeBlock->ownerExecutable(), executable, callLinkInfo.codeOrigin));
+        *vm, callerCodeBlock->ownerExecutable(), executable));
     
     RepatchBuffer repatchBuffer(callerCodeBlock);