Changeset 172648 in webkit for trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

Timestamp:

Aug 15, 2014, 2:04:31 PM (11 years ago)

Author:

[email protected]

Message:

Made native inlining errors not segfault.
​https://bugs.webkit.org/show_bug.cgi?id=135988

Reviewed by Geoffrey Garen.

• ftl/FTLAbbreviations.h:

(JSC::FTL::disposeMessage): Added.

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compilePutById):
abstracted out Options::verboseCompilation as was the case in the rest of the file.
(JSC::FTL::LowerDFGToLLVM::compileNativeCallOrConstruct):
(JSC::FTL::LowerDFGToLLVM::getModuleByPathForSymbol):
added output error messages for llvm module loading.

File:

• trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

@@ -1900 +1900 @@
         unsigned stackmapID = m_stackmapIDs++;
 
-        if (Options::verboseCompilation())
+        if (verboseCompilationEnabled())
             dataLog("    Emitting PutById patchpoint with stackmap #", stackmapID, "\n");
         
@@ -3716 +3716 @@
         LValue call = vmCall(callee, argument);
 
-        if (Options::verboseCompilation())
+        if (verboseCompilationEnabled())
             dataLog("Native calling: ", info.dli_sname, "\n");
 
@@ -4383 +4383 @@
             path.data());
 
-        if (createMemoryBufferWithContentsOfFile(actualPath.data(), &memBuf, nullptr)) {
-            if (Options::verboseCompilation()) 
-                dataLog("Failed to load module at ", actualPath.data(), "\n for symbol ", symbol.data());
+        char* outMsg;
+        
+        if (createMemoryBufferWithContentsOfFile(actualPath.data(), &memBuf, &outMsg)) {
+            if (Options::verboseFTLFailure())
+                dataLog("Failed to load module at ", actualPath, "\n for symbol ", symbol, "\nERROR: ", outMsg, "\n");
+            disposeMessage(outMsg);
             return false;
         }
@@ -4391 +4394 @@
         LModule module;
 
-        if (parseBitcodeInContext(m_ftlState.context, memBuf, &module, nullptr)) {
+        if (parseBitcodeInContext(m_ftlState.context, memBuf, &module, &outMsg)) {
+            if (Options::verboseFTLFailure())
+                dataLog("Failed to parse module at ", actualPath, "\n for symbol ", symbol, "\nERROR: ", outMsg, "\n");
             disposeMemoryBuffer(memBuf);
+            disposeMessage(outMsg);
             return false;
         }
@@ -4425 +4431 @@
         }
 
-        if (linkModules(m_ftlState.module, module, LLVMLinkerDestroySource, nullptr))
+        if (linkModules(m_ftlState.module, module, LLVMLinkerDestroySource, &outMsg)) {
+            if (Options::verboseFTLFailure())
+                dataLog("Failed to link module at ", actualPath, "\n for symbol ", symbol, "\nERROR: ", outMsg, "\n");
+            disposeMessage(outMsg);
             return false;
+        }
         
         for (CString* symbol = namedFunctions.begin(); symbol != namedFunctions.end(); ++symbol) {