From d1b31723523f163722b63ffbba69df4ae4059819 Mon Sep 17 00:00:00 2001 From: Sean Cannella Date: Wed, 19 Jun 2013 21:16:21 -0700 Subject: [PATCH] remove hphp_process_abort - Remove questionable hphp_process_abort debugging method --- hphp/runtime/ext/ext_misc.cpp | 9 --------- hphp/runtime/ext/ext_misc.h | 1 - hphp/system/idl/misc.idl.json | 20 +------------------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/hphp/runtime/ext/ext_misc.cpp b/hphp/runtime/ext/ext_misc.cpp index 71a73373a..43b6f2ef4 100644 --- a/hphp/runtime/ext/ext_misc.cpp +++ b/hphp/runtime/ext/ext_misc.cpp @@ -370,15 +370,6 @@ String f_token_name(int64_t token) { return "UNKNOWN"; } -static const StaticString s_marauder("I solemnly swear that I am up to no good."); - -Variant f_hphp_process_abort(CVarRef magic) { - if (equal(magic, s_marauder)) { - *((int*)0) = 0xdead; - } - return null_variant; -} - String f_hphp_to_string(CVarRef v) { return v.toString(); } diff --git a/hphp/runtime/ext/ext_misc.h b/hphp/runtime/ext/ext_misc.h index 42bc7734e..63a1bcb06 100644 --- a/hphp/runtime/ext/ext_misc.h +++ b/hphp/runtime/ext/ext_misc.h @@ -52,7 +52,6 @@ Variant f_unpack(CStrRef format, CStrRef data); Array f_sys_getloadavg(); Array f_token_get_all(CStrRef source); String f_token_name(int64_t token); -Variant f_hphp_process_abort(CVarRef magic); String f_hphp_to_string(CVarRef v); extern const double k_INF; extern const double k_NAN; diff --git a/hphp/system/idl/misc.idl.json b/hphp/system/idl/misc.idl.json index fe2bcb500..058485c83 100644 --- a/hphp/system/idl/misc.idl.json +++ b/hphp/system/idl/misc.idl.json @@ -530,24 +530,6 @@ } ] }, - { - "name": "hphp_process_abort", - "desc": "Causes the process to die immediately in an undefined way.", - "flags": [ - "HasDocComment" - ], - "return": { - "type": "Variant", - "desc": "No value is returned." - }, - "args": [ - { - "name": "magic", - "type": "Variant", - "desc": "You shouldn't be calling this function if you don't know the magic value." - } - ] - }, { "name": "hphp_to_string", "desc": "Casts a given value to a string.", @@ -569,4 +551,4 @@ ], "classes": [ ] -} \ No newline at end of file +}