Changeset 164057 in webkit

Timestamp:

Feb 13, 2014, 2:34:18 PM (12 years ago)

Author:

fpizlo@apple.com

Message:

FTL should be OK with compact_unwind in a data section
​https://bugs.webkit.org/show_bug.cgi?id=128756

Reviewed by Mark Hahnenberg.

• ftl/FTLCompile.cpp:

(JSC::FTL::mmAllocateCodeSection):
(JSC::FTL::mmAllocateDataSection):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLCompile.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-02-13  Filip Pizlo  <fpizlo@apple.com>
+
+        FTL should be OK with __compact_unwind in a data section
+        https://bugs.webkit.org/show_bug.cgi?id=128756
+
+        Reviewed by Mark Hahnenberg.
+
+        * ftl/FTLCompile.cpp:
+        (JSC::FTL::mmAllocateCodeSection):
+        (JSC::FTL::mmAllocateDataSection):
+
 2014-02-13  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp

@@ -60 +60 @@
             state.graph.m_vm, size, state.graph.m_codeBlock, JITCompilationMustSucceed);
     
+    // LLVM used to put __compact_unwind in a code section. We keep this here defensively,
+    // for clients that use older LLVMs.
     if (!strcmp(sectionName, "__compact_unwind")) {
         state.compactUnwind = result->start();
@@ -90 +92 @@
         state.jitCode->addDataSection(section);
         state.dataSectionNames.append(sectionName);
+        if (!strcmp(sectionName, "__compact_unwind")) {
+            state.compactUnwind = section.data();
+            state.compactUnwindSize = size;
+        }
     }