Changeset 241593 in webkit for trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp

Timestamp:

Feb 15, 2019, 10:26:16 AM (6 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r241559 and r241566.
​https://bugs.webkit.org/show_bug.cgi?id=194710

Causes layout test crashes under GuardMalloc (Requested by
ryanhaddad on #webkit).

Reverted changesets:

"[WTF] Add environment variable helpers"
​https://bugs.webkit.org/show_bug.cgi?id=192405
​https://trac.webkit.org/changeset/241559

"Unreviewed build fix for WinCairo Debug after r241559."
​https://trac.webkit.org/changeset/241566

File:

• trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp

@@ -29 +29 @@
 #include "CodeProfile.h"
 #include "MachineContext.h"
-#include <wtf/Environment.h>
 #include <wtf/MetaAllocator.h>
 
@@ -87 +86 @@
 {
     // Check for JSC_CODE_PROFILING.
-    auto codeProfilingMode = Environment::getUInt("JSC_CODE_PROFILING");
+    const char* codeProfilingMode = getenv("JSC_CODE_PROFILING");
     if (!codeProfilingMode)
         return;
 
-    // Check for a valid mode, currently 1, 2, or 3.
+    // Check for a valid mode, currently "1", "2", or "3".
+    if (!codeProfilingMode[0] || codeProfilingMode[1])
+        return;
     switch (*codeProfilingMode) {
-    case 1:
+    case '1':
         s_mode = Enabled;
         break;
-    case 2:
+    case '2':
         s_mode = Verbose;
         break;
-    case 3:
+    case '3':
         s_mode = VeryVerbose;
         break;