Changeset 211834 in webkit for trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp

Timestamp:

Feb 7, 2017, 1:22:20 PM (8 years ago)

Author:

[email protected]

Message:

SigillCrashAnalyzer::analyze() should use a do-while loop instead of a lambda.
​https://bugs.webkit.org/show_bug.cgi?id=167950

Reviewed by Michael Saboff.

Lambdas aren't free (apparently, the compiler isn't able to detect that the
lambda does not escape and can be inlined completely). So, use a do-while loop
instead since we don't really need a lambda here.

• tools/SigillCrashAnalyzer.cpp:

File:

• trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp

@@ -272 +272 @@
     log("BEGIN SIGILL analysis");
 
-    [&] () {
+    do {
         // First, dump the signal context info so that we'll at least have the same info
         // that the default crash handler would given us in case this crash analyzer
@@ -286 +286 @@
             ASSERT(expectedLocker.error() == VMInspector::Error::TimedOut);
             log("ERROR: Unable to analyze SIGILL. Timed out while waiting to iterate VMs.");
-            return;
+            break;
         }
         auto& locker = expectedLocker.value();
@@ -294 +294 @@
         if (!isInJITMemory) {
             log("ERROR: Timed out: not able to determine if pc %p is in valid JIT executable memory", pc);
-            return;
+            break;
         }
         if (!isInJITMemory.value()) {
             log("pc %p is NOT in valid JIT executable memory", pc);
             crashSource = CrashSource::Other;
-            return;
+            break;
         }
         log("pc %p is in valid JIT executable memory", pc);
@@ -308 +308 @@
         if (pcAsSize != roundUpToMultipleOf<sizeof(uint32_t)>(pcAsSize)) {
             log("pc %p is NOT properly aligned", pc);
-            return;
+            break;
         }
 
@@ -323 +323 @@
             else
                 log("The current thread does not own any VM JSLock");
-            return;
+            break;
         }
         CodeBlock* codeBlock = expectedCodeBlock.value();
         if (!codeBlock) {
             log("machine PC %p does not belong to any CodeBlock in the currently entered VM", pc);
-            return;
+            break;
         }
 
@@ -334 +334 @@
 
         dumpCodeBlock(codeBlock, pc);
-    } ();
+    } while (false);
 
     log("END SIGILL analysis");