Changeset 163027 in webkit for trunk/Source/JavaScriptCore/dfg/DFGPlan.h

Timestamp:

Jan 29, 2014, 11:18:54 AM (12 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/dfg/DFGPlan.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/dfg/DFGPlan.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56 +56 @@
 struct Plan : public ThreadSafeRefCounted<Plan> {
     Plan(
-        PassRefPtr<CodeBlock>, CompilationMode, unsigned osrEntryBytecodeIndex,
+        PassRefPtr<CodeBlock> codeBlockToCompile, CodeBlock* profiledDFGCodeBlock,
+        CompilationMode, unsigned osrEntryBytecodeIndex,
         const Operands<JSValue>& mustHandleValues);
     ~Plan();
@@ -71 +72 @@
     VM& vm;
     RefPtr<CodeBlock> codeBlock;
+    RefPtr<CodeBlock> profiledDFGCodeBlock;
     CompilationMode mode;
     const unsigned osrEntryBytecodeIndex;
@@ -85 +87 @@
     DesiredWriteBarriers writeBarriers;
     DesiredTransitions transitions;
+    
+    bool willTryToTierUp;
 
     double beforeFTL;
@@ -93 +97 @@
 
 private:
+    bool reportCompileTimes() const;
+    
     enum CompilationPath { FailPath, DFGPath, FTLPath };
     CompilationPath compileInThreadImpl(LongLivedState&);