Changeset 163027 in webkit for trunk/Source/JavaScriptCore/dfg/DFGDriver.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/DFGDriver.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGDriver.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41 +41 @@
 namespace DFG {
 
-class Worklist;
-
 JS_EXPORT_PRIVATE unsigned getNumCompilations();
 
@@ -48 +46 @@
 // compile. Even if we do a synchronous compile, we call the callback with the result.
 CompilationResult compile(
-    VM&, CodeBlock*, CompilationMode, unsigned osrEntryBytecodeIndex,
-    const Operands<JSValue>& mustHandleValues,
-    PassRefPtr<DeferredCompilationCallback>, Worklist*);
+    VM&, CodeBlock*, CodeBlock* profiledDFGCodeBlock, CompilationMode,
+    unsigned osrEntryBytecodeIndex, const Operands<JSValue>& mustHandleValues,
+    PassRefPtr<DeferredCompilationCallback>);
 
 } } // namespace JSC::DFG