Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 76 insertions, 24 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
index a7fccd58f..bf445610d 100644
--- a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,34 +37,81 @@ Disassembler::Disassembler(Graph& graph)
     : m_graph(graph)
 {
     m_labelForBlockIndex.resize(graph.m_blocks.size());
-    m_labelForNodeIndex.resize(graph.size());
 }
 
 void Disassembler::dump(PrintStream& out, LinkBuffer& linkBuffer)
 {
-    m_graph.m_dominators.computeIfNecessary(m_graph);
+    Vector<DumpedOp> ops = createDumpList(linkBuffer);
+    for (unsigned i = 0; i < ops.size(); ++i)
+        out.print(ops[i].text);
+}
+
+void Disassembler::dump(LinkBuffer& linkBuffer)
+{
+    dump(WTF::dataFile(), linkBuffer);
+}
+
+void Disassembler::reportToProfiler(Profiler::Compilation* compilation, LinkBuffer& linkBuffer)
+{
+    Vector<DumpedOp> ops = createDumpList(linkBuffer);
     
-    out.print("Generated JIT code for ", CodeBlockWithJITType(m_graph.m_codeBlock, JITCode::DFGJIT), ", instruction count = ", m_graph.m_codeBlock->instructionCount(), ":\n");
+    for (unsigned i = 0; i < ops.size(); ++i) {
+        Profiler::OriginStack stack;
+        
+        if (ops[i].codeOrigin.isSet())
+            stack = Profiler::OriginStack(*m_graph.m_vm.m_perBytecodeProfiler, m_graph.m_codeBlock, ops[i].codeOrigin);
+        
+        compilation->addDescription(Profiler::CompiledBytecode(stack, ops[i].text));
+    }
+}
+
+void Disassembler::dumpHeader(PrintStream& out, LinkBuffer& linkBuffer)
+{
+    out.print("Generated DFG JIT code for ", CodeBlockWithJITType(m_graph.m_codeBlock, JITCode::DFGJIT), ", instruction count = ", m_graph.m_codeBlock->instructionCount(), ":\n");
+    out.print("    Optimized with execution counter = ", m_graph.m_profiledBlock->jitExecuteCounter(), "\n");
+    out.print("    Source: ", m_graph.m_codeBlock->sourceCodeOnOneLine(), "\n");
     out.print("    Code at [", RawPointer(linkBuffer.debugAddress()), ", ", RawPointer(static_cast<char*>(linkBuffer.debugAddress()) + linkBuffer.debugSize()), "):\n");
+}
+
+void Disassembler::append(Vector<Disassembler::DumpedOp>& result, StringPrintStream& out, CodeOrigin& previousOrigin)
+{
+    result.append(DumpedOp(previousOrigin, out.toCString()));
+    previousOrigin = CodeOrigin();
+    out.reset();
+}
+
+Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuffer)
+{
+    StringPrintStream out;
+    Vector<DumpedOp> result;
+    
+    CodeOrigin previousOrigin = CodeOrigin();
+    dumpHeader(out, linkBuffer);
+    append(result, out, previousOrigin);
+    
+    m_graph.m_dominators.computeIfNecessary(m_graph);
     
     const char* prefix = "    ";
     const char* disassemblyPrefix = "        ";
     
-    NodeIndex lastNodeIndex = NoNode;
+    Node* lastNode = 0;
     MacroAssembler::Label previousLabel = m_startOfCode;
     for (size_t blockIndex = 0; blockIndex < m_graph.m_blocks.size(); ++blockIndex) {
         BasicBlock* block = m_graph.m_blocks[blockIndex].get();
         if (!block)
             continue;
-        dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_labelForBlockIndex[blockIndex], lastNodeIndex);
+        dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_labelForBlockIndex[blockIndex], lastNode);
+        append(result, out, previousOrigin);
         m_graph.dumpBlockHeader(out, prefix, blockIndex, Graph::DumpLivePhisOnly);
-        NodeIndex lastNodeIndexForDisassembly = block->at(0);
+        append(result, out, previousOrigin);
+        Node* lastNodeForDisassembly = block->at(0);
         for (size_t i = 0; i < block->size(); ++i) {
-            if (!m_graph[block->at(i)].willHaveCodeGenOrOSR() && !Options::showAllDFGNodes())
+            if (!block->at(i)->willHaveCodeGenOrOSR() && !Options::showAllDFGNodes())
                 continue;
             MacroAssembler::Label currentLabel;
-            if (m_labelForNodeIndex[block->at(i)].isSet())
-                currentLabel = m_labelForNodeIndex[block->at(i)];
+            HashMap<Node*, MacroAssembler::Label>::iterator iter = m_labelForNode.find(block->at(i));
+            if (iter != m_labelForNode.end())
+                currentLabel = iter->value;
             else {
                 // Dump the last instruction by using the first label of the next block
                 // as the end point. This case is hit either during peephole compare
@@ -75,31 +122,36 @@ void Disassembler::dump(PrintStream& out, LinkBuffer& linkBuffer)
                 else
                     currentLabel = m_endOfMainPath;
             }
-            dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, currentLabel, lastNodeIndexForDisassembly);
-            m_graph.dumpCodeOrigin(out, prefix, lastNodeIndex, block->at(i));
+            dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, currentLabel, lastNodeForDisassembly);
+            append(result, out, previousOrigin);
+            previousOrigin = block->at(i)->codeOrigin;
+            if (m_graph.dumpCodeOrigin(out, prefix, lastNode, block->at(i))) {
+                append(result, out, previousOrigin);
+                previousOrigin = block->at(i)->codeOrigin;
+            }
             m_graph.dump(out, prefix, block->at(i));
-            lastNodeIndex = block->at(i);
-            lastNodeIndexForDisassembly = block->at(i);
+            lastNode = block->at(i);
+            lastNodeForDisassembly = block->at(i);
         }
     }
-    dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_endOfMainPath, lastNodeIndex);
+    dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_endOfMainPath, lastNode);
+    append(result, out, previousOrigin);
     out.print(prefix, "(End Of Main Path)\n");
-    dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_endOfCode, NoNode);
-}
-
-void Disassembler::dump(LinkBuffer& linkBuffer)
-{
-    dump(WTF::dataFile(), linkBuffer);
+    append(result, out, previousOrigin);
+    dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, m_endOfCode, 0);
+    append(result, out, previousOrigin);
+    
+    return result;
 }
 
-void Disassembler::dumpDisassembly(PrintStream& out, const char* prefix, LinkBuffer& linkBuffer, MacroAssembler::Label& previousLabel, MacroAssembler::Label currentLabel, NodeIndex context)
+void Disassembler::dumpDisassembly(PrintStream& out, const char* prefix, LinkBuffer& linkBuffer, MacroAssembler::Label& previousLabel, MacroAssembler::Label currentLabel, Node* context)
 {
     size_t prefixLength = strlen(prefix);
     int amountOfNodeWhiteSpace;
-    if (context == NoNode)
+    if (!context)
         amountOfNodeWhiteSpace = 0;
     else
-        amountOfNodeWhiteSpace = Graph::amountOfNodeWhiteSpace(m_graph[context]);
+        amountOfNodeWhiteSpace = Graph::amountOfNodeWhiteSpace(context);
     OwnArrayPtr<char> prefixBuffer = adoptArrayPtr(new char[prefixLength + amountOfNodeWhiteSpace + 1]);
     strcpy(prefixBuffer.get(), prefix);
     for (int i = 0; i < amountOfNodeWhiteSpace; ++i)