Rewrite gen_ext_hhvm and gen_infotabs in C++

This is a near-straight translation of gen_ext_hhvm.php into C++. The
main goal of this change is to break the bootstrap cycle in the build
process: we have to run PHP scripts to build our PHP interpreter. This
isn't so bad for us internally, but in the open-source build, it's
philosophically lame to depend on an external PHP interpreter (i.e.
Zend) to build HHVM. To get around this, we have to check in the
generated ext_hhvm files: no good.

There's nothing particularly sophisticated in this program; it's just a
bunch of grunt work. I took the opportunity to make a few improvements
to the generated code -- there was some int-width confusion, and a bunch of
duplicated code to transfer return values to the right place.

hphp/CMakeLists.txt

@@ -91,6 +91,8 @@ SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
 
 hphp_link(hphp_runtime_static)
 
+add_subdirectory("tools/gen-ext-hhvm")
+
 add_subdirectory(compiler)
 add_subdirectory(runtime/ext_hhvm)
 add_subdirectory(hhvm)

hphp/idl/array.idl.json

@@ -145,6 +145,8 @@
         {
             "name": "array_column",
             "desc": "Return the values from a single column in the input array, identified by the value_key and optionally indexed by the index_key",
+            "flags": [
+            ],
             "return": {
               "type": "Variant",
               "desc": "Returns the array column, or FALSE on failure"

hphp/runtime/base/builtin_functions.ext_hhvm.cpp

@@ -13,51 +13,36 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::String HPHP::f_serialize(HPHP::Variant const&)
-_ZN4HPHP11f_serializeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-value => rsi
-*/
-
 Value* fh_serialize(Value* _rv, TypedValue* value) asm("_ZN4HPHP11f_serializeERKNS_7VariantE");
 
-TypedValue* fg_serialize(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfString;
-      fh_serialize((&rv.m_data), (args-0));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("serialize", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_serialize(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfString;
+    fh_serialize(&(rv->m_data), (args-0));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_wrong_arguments_nr("serialize", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/base/builtin_functions.ext_hhvm.h

@@ -15,17 +15,6 @@
 */
 namespace HPHP {
 
-/*
-HPHP::String HPHP::f_serialize(HPHP::Variant const&)
-_ZN4HPHP11f_serializeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-value => rsi
-*/
-
 Value* fh_serialize(Value* _rv, TypedValue* value) asm("_ZN4HPHP11f_serializeERKNS_7VariantE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/JSON_parser.ext_hhvm.cpp

@@ -14,16 +14,15 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/JSON_parser.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/asio_context.ext_hhvm.cpp

@@ -14,16 +14,15 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/asio_context.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/asio_session.ext_hhvm.cpp

@@ -14,16 +14,15 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/asio_session.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/blockable_wait_handle.ext_hhvm.cpp

@@ -14,53 +14,41 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
 IMPLEMENT_CLASS(BlockableWaitHandle);
-/*
-void HPHP::c_BlockableWaitHandle::t___construct()
-_ZN4HPHP21c_BlockableWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_19BlockableWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP21c_BlockableWaitHandle13t___constructEv");
 
-TypedValue* tg_19BlockableWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_19BlockableWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("BlockableWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_19BlockableWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_19BlockableWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("BlockableWaitHandle::__construct");
+      throw_toomany_arguments_nr("BlockableWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("BlockableWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/blockable_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/continuation_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_ContinuationWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_ContinuationWaitHandle) - sizeof(ObjectData);
@@ -34,185 +36,127 @@ HPHP::VM::Instance* new_ContinuationWaitHandle_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(ContinuationWaitHandle);
-/*
-void HPHP::c_ContinuationWaitHandle::t___construct()
-_ZN4HPHP24c_ContinuationWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_22ContinuationWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP24c_ContinuationWaitHandle13t___constructEv");
 
-TypedValue* tg_22ContinuationWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_22ContinuationWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ContinuationWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_22ContinuationWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_22ContinuationWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("ContinuationWaitHandle::__construct");
+      throw_toomany_arguments_nr("ContinuationWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ContinuationWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ContinuationWaitHandle::ti_start(char const*, HPHP::Object const&)
-_ZN4HPHP24c_ContinuationWaitHandle8ti_startEPKcRKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-continuation => rdx
-*/
-
 Value* th_22ContinuationWaitHandle_start(Value* _rv, char const* cls_, Value* continuation) asm("_ZN4HPHP24c_ContinuationWaitHandle8ti_startEPKcRKNS_6ObjectE");
 
-TypedValue* tg1_22ContinuationWaitHandle_start(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue* tg1_22ContinuationWaitHandle_start(TypedValue* rv, ActRec* ar, int64_t count) {
+void tg1_22ContinuationWaitHandle_start(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void tg1_22ContinuationWaitHandle_start(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToObjectInPlace(args-0);
-  th_22ContinuationWaitHandle_start((&rv->m_data), ("ContinuationWaitHandle"), &args[-0].m_data);
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_22ContinuationWaitHandle_start(&(rv->m_data), "ContinuationWaitHandle", &args[-0].m_data);
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_22ContinuationWaitHandle_start(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        rv.m_type = KindOfObject;
-        th_22ContinuationWaitHandle_start((&rv.m_data), ("ContinuationWaitHandle"), &args[-0].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        tg1_22ContinuationWaitHandle_start(&rv, ar, count );
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* tg_22ContinuationWaitHandle_start(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      rv->m_type = KindOfObject;
+      th_22ContinuationWaitHandle_start(&(rv->m_data), "ContinuationWaitHandle", &args[-0].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("ContinuationWaitHandle::start", count, 1, 1, 1);
+      tg1_22ContinuationWaitHandle_start(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("ContinuationWaitHandle::start", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ContinuationWaitHandle::t_getprivdata()
-_ZN4HPHP24c_ContinuationWaitHandle13t_getprivdataEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_22ContinuationWaitHandle_getPrivData(Value* _rv, ObjectData* this_) asm("_ZN4HPHP24c_ContinuationWaitHandle13t_getprivdataEv");
 
-TypedValue* tg_22ContinuationWaitHandle_getPrivData(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfObject;
-        th_22ContinuationWaitHandle_getPrivData((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ContinuationWaitHandle::getPrivData", 0, 1);
-      }
+TypedValue* tg_22ContinuationWaitHandle_getPrivData(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfObject;
+      th_22ContinuationWaitHandle_getPrivData(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("ContinuationWaitHandle::getPrivData");
+      throw_toomany_arguments_nr("ContinuationWaitHandle::getPrivData", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ContinuationWaitHandle::getPrivData");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_ContinuationWaitHandle::t_setprivdata(HPHP::Object const&)
-_ZN4HPHP24c_ContinuationWaitHandle13t_setprivdataERKNS_6ObjectE
-
-this_ => rdi
-data => rsi
-*/
-
 void th_22ContinuationWaitHandle_setPrivData(ObjectData* this_, Value* data) asm("_ZN4HPHP24c_ContinuationWaitHandle13t_setprivdataERKNS_6ObjectE");
 
-TypedValue* tg1_22ContinuationWaitHandle_setPrivData(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_22ContinuationWaitHandle_setPrivData(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_22ContinuationWaitHandle_setPrivData(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_22ContinuationWaitHandle_setPrivData(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToObjectInPlace(args-0);
+  rv->m_type = KindOfNull;
   th_22ContinuationWaitHandle_setPrivData((this_), &args[-0].m_data);
-  return rv;
 }
 
-TypedValue* tg_22ContinuationWaitHandle_setPrivData(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 1LL) {
-        if ((args-0)->m_type == KindOfObject) {
-          rv.m_data.num = 0LL;
-          rv.m_type = KindOfNull;
-          th_22ContinuationWaitHandle_setPrivData((this_), &args[-0].m_data);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_22ContinuationWaitHandle_setPrivData(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_22ContinuationWaitHandle_setPrivData(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 1) {
+      if ((args - 0)->m_type == KindOfObject) {
+        rv->m_type = KindOfNull;
+        th_22ContinuationWaitHandle_setPrivData((this_), &args[-0].m_data);
       } else {
-        throw_wrong_arguments_nr("ContinuationWaitHandle::setPrivData", count, 1, 1, 1);
+        tg1_22ContinuationWaitHandle_setPrivData(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ContinuationWaitHandle::setPrivData");
+      throw_wrong_arguments_nr("ContinuationWaitHandle::setPrivData", count, 1, 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ContinuationWaitHandle::setPrivData");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/continuation_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/gen_array_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_GenArrayWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_GenArrayWaitHandle) - sizeof(ObjectData);
@@ -34,93 +36,64 @@ HPHP::VM::Instance* new_GenArrayWaitHandle_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(GenArrayWaitHandle);
-/*
-void HPHP::c_GenArrayWaitHandle::t___construct()
-_ZN4HPHP20c_GenArrayWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_18GenArrayWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP20c_GenArrayWaitHandle13t___constructEv");
 
-TypedValue* tg_18GenArrayWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_18GenArrayWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("GenArrayWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_18GenArrayWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_18GenArrayWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("GenArrayWaitHandle::__construct");
+      throw_toomany_arguments_nr("GenArrayWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("GenArrayWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_GenArrayWaitHandle::ti_create(char const*, HPHP::Array const&)
-_ZN4HPHP20c_GenArrayWaitHandle9ti_createEPKcRKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-dependencies => rdx
-*/
-
 Value* th_18GenArrayWaitHandle_create(Value* _rv, char const* cls_, Value* dependencies) asm("_ZN4HPHP20c_GenArrayWaitHandle9ti_createEPKcRKNS_5ArrayE");
 
-TypedValue* tg1_18GenArrayWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue* tg1_18GenArrayWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) {
+void tg1_18GenArrayWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void tg1_18GenArrayWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToArrayInPlace(args-0);
-  th_18GenArrayWaitHandle_create((&rv->m_data), ("GenArrayWaitHandle"), &args[-0].m_data);
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_18GenArrayWaitHandle_create(&(rv->m_data), "GenArrayWaitHandle", &args[-0].m_data);
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_18GenArrayWaitHandle_create(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfArray) {
-        rv.m_type = KindOfObject;
-        th_18GenArrayWaitHandle_create((&rv.m_data), ("GenArrayWaitHandle"), &args[-0].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        tg1_18GenArrayWaitHandle_create(&rv, ar, count );
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* tg_18GenArrayWaitHandle_create(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfArray) {
+      rv->m_type = KindOfObject;
+      th_18GenArrayWaitHandle_create(&(rv->m_data), "GenArrayWaitHandle", &args[-0].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("GenArrayWaitHandle::create", count, 1, 1, 1);
+      tg1_18GenArrayWaitHandle_create(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("GenArrayWaitHandle::create", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/gen_array_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/reschedule_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_RescheduleWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_RescheduleWaitHandle) - sizeof(ObjectData);
@@ -34,99 +36,70 @@ HPHP::VM::Instance* new_RescheduleWaitHandle_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(RescheduleWaitHandle);
-/*
-void HPHP::c_RescheduleWaitHandle::t___construct()
-_ZN4HPHP22c_RescheduleWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_20RescheduleWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP22c_RescheduleWaitHandle13t___constructEv");
 
-TypedValue* tg_20RescheduleWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_20RescheduleWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("RescheduleWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_20RescheduleWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_20RescheduleWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("RescheduleWaitHandle::__construct");
+      throw_toomany_arguments_nr("RescheduleWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("RescheduleWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_RescheduleWaitHandle::ti_create(char const*, int, int)
-_ZN4HPHP22c_RescheduleWaitHandle9ti_createEPKcii
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-queue => rdx
-priority => rcx
-*/
-
 Value* th_20RescheduleWaitHandle_create(Value* _rv, char const* cls_, int queue, int priority) asm("_ZN4HPHP22c_RescheduleWaitHandle9ti_createEPKcii");
 
-TypedValue* tg1_20RescheduleWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue* tg1_20RescheduleWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) {
+void tg1_20RescheduleWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void tg1_20RescheduleWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   if ((args-1)->m_type != KindOfInt64) {
     tvCastToInt64InPlace(args-1);
   }
   if ((args-0)->m_type != KindOfInt64) {
     tvCastToInt64InPlace(args-0);
   }
-  th_20RescheduleWaitHandle_create((&rv->m_data), ("RescheduleWaitHandle"), (int)(args[-0].m_data.num), (int)(args[-1].m_data.num));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_20RescheduleWaitHandle_create(&(rv->m_data), "RescheduleWaitHandle", (int)(args[-0].m_data.num), (int)(args[-1].m_data.num));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_20RescheduleWaitHandle_create(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if ((args-1)->m_type == KindOfInt64 && (args-0)->m_type == KindOfInt64) {
-        rv.m_type = KindOfObject;
-        th_20RescheduleWaitHandle_create((&rv.m_data), ("RescheduleWaitHandle"), (int)(args[-0].m_data.num), (int)(args[-1].m_data.num));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        tg1_20RescheduleWaitHandle_create(&rv, ar, count );
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* tg_20RescheduleWaitHandle_create(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 2) {
+    if ((args - 1)->m_type == KindOfInt64 &&
+        (args - 0)->m_type == KindOfInt64) {
+      rv->m_type = KindOfObject;
+      th_20RescheduleWaitHandle_create(&(rv->m_data), "RescheduleWaitHandle", (int)(args[-0].m_data.num), (int)(args[-1].m_data.num));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("RescheduleWaitHandle::create", count, 2, 2, 1);
+      tg1_20RescheduleWaitHandle_create(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("RescheduleWaitHandle::create", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/reschedule_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/set_result_to_ref_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_SetResultToRefWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_SetResultToRefWaitHandle) - sizeof(ObjectData);
@@ -34,94 +36,64 @@ HPHP::VM::Instance* new_SetResultToRefWaitHandle_Instance(HPHP::VM::Class* cls)
 }
 
 IMPLEMENT_CLASS(SetResultToRefWaitHandle);
-/*
-void HPHP::c_SetResultToRefWaitHandle::t___construct()
-_ZN4HPHP26c_SetResultToRefWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_24SetResultToRefWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP26c_SetResultToRefWaitHandle13t___constructEv");
 
-TypedValue* tg_24SetResultToRefWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_24SetResultToRefWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("SetResultToRefWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_24SetResultToRefWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_24SetResultToRefWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("SetResultToRefWaitHandle::__construct");
+      throw_toomany_arguments_nr("SetResultToRefWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SetResultToRefWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_SetResultToRefWaitHandle::ti_create(char const*, HPHP::Object const&, HPHP::VRefParamValue const&)
-_ZN4HPHP26c_SetResultToRefWaitHandle9ti_createEPKcRKNS_6ObjectERKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-wait_handle => rdx
-ref => rcx
-*/
-
 Value* th_24SetResultToRefWaitHandle_create(Value* _rv, char const* cls_, Value* wait_handle, TypedValue* ref) asm("_ZN4HPHP26c_SetResultToRefWaitHandle9ti_createEPKcRKNS_6ObjectERKNS_14VRefParamValueE");
 
-TypedValue* tg1_24SetResultToRefWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue* tg1_24SetResultToRefWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) {
+void tg1_24SetResultToRefWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void tg1_24SetResultToRefWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToObjectInPlace(args-0);
-  th_24SetResultToRefWaitHandle_create((&rv->m_data), ("SetResultToRefWaitHandle"), &args[-0].m_data, (args-1));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_24SetResultToRefWaitHandle_create(&(rv->m_data), "SetResultToRefWaitHandle", &args[-0].m_data, (args-1));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_24SetResultToRefWaitHandle_create(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        rv.m_type = KindOfObject;
-        th_24SetResultToRefWaitHandle_create((&rv.m_data), ("SetResultToRefWaitHandle"), &args[-0].m_data, (args-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        tg1_24SetResultToRefWaitHandle_create(&rv, ar, count );
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* tg_24SetResultToRefWaitHandle_create(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 2) {
+    if ((args - 0)->m_type == KindOfObject) {
+      rv->m_type = KindOfObject;
+      th_24SetResultToRefWaitHandle_create(&(rv->m_data), "SetResultToRefWaitHandle", &args[-0].m_data, (args-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("SetResultToRefWaitHandle::create", count, 2, 2, 1);
+      tg1_24SetResultToRefWaitHandle_create(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("SetResultToRefWaitHandle::create", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/set_result_to_ref_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_exception_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_StaticExceptionWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_StaticExceptionWaitHandle) - sizeof(ObjectData);
@@ -34,93 +36,64 @@ HPHP::VM::Instance* new_StaticExceptionWaitHandle_Instance(HPHP::VM::Class* cls)
 }
 
 IMPLEMENT_CLASS(StaticExceptionWaitHandle);
-/*
-void HPHP::c_StaticExceptionWaitHandle::t___construct()
-_ZN4HPHP27c_StaticExceptionWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_25StaticExceptionWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP27c_StaticExceptionWaitHandle13t___constructEv");
 
-TypedValue* tg_25StaticExceptionWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_25StaticExceptionWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("StaticExceptionWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_25StaticExceptionWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_25StaticExceptionWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("StaticExceptionWaitHandle::__construct");
+      throw_toomany_arguments_nr("StaticExceptionWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("StaticExceptionWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_StaticExceptionWaitHandle::ti_create(char const*, HPHP::Object const&)
-_ZN4HPHP27c_StaticExceptionWaitHandle9ti_createEPKcRKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-exception => rdx
-*/
-
 Value* th_25StaticExceptionWaitHandle_create(Value* _rv, char const* cls_, Value* exception) asm("_ZN4HPHP27c_StaticExceptionWaitHandle9ti_createEPKcRKNS_6ObjectE");
 
-TypedValue* tg1_25StaticExceptionWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue* tg1_25StaticExceptionWaitHandle_create(TypedValue* rv, ActRec* ar, int64_t count) {
+void tg1_25StaticExceptionWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void tg1_25StaticExceptionWaitHandle_create(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToObjectInPlace(args-0);
-  th_25StaticExceptionWaitHandle_create((&rv->m_data), ("StaticExceptionWaitHandle"), &args[-0].m_data);
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_25StaticExceptionWaitHandle_create(&(rv->m_data), "StaticExceptionWaitHandle", &args[-0].m_data);
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_25StaticExceptionWaitHandle_create(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        rv.m_type = KindOfObject;
-        th_25StaticExceptionWaitHandle_create((&rv.m_data), ("StaticExceptionWaitHandle"), &args[-0].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        tg1_25StaticExceptionWaitHandle_create(&rv, ar, count );
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* tg_25StaticExceptionWaitHandle_create(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      rv->m_type = KindOfObject;
+      th_25StaticExceptionWaitHandle_create(&(rv->m_data), "StaticExceptionWaitHandle", &args[-0].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("StaticExceptionWaitHandle::create", count, 1, 1, 1);
+      tg1_25StaticExceptionWaitHandle_create(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("StaticExceptionWaitHandle::create", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_exception_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_result_wait_handle.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_StaticResultWaitHandle_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_StaticResultWaitHandle) - sizeof(ObjectData);
@@ -34,76 +36,51 @@ HPHP::VM::Instance* new_StaticResultWaitHandle_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(StaticResultWaitHandle);
-/*
-void HPHP::c_StaticResultWaitHandle::t___construct()
-_ZN4HPHP24c_StaticResultWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_22StaticResultWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP24c_StaticResultWaitHandle13t___constructEv");
 
-TypedValue* tg_22StaticResultWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_22StaticResultWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("StaticResultWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_22StaticResultWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_22StaticResultWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("StaticResultWaitHandle::__construct");
+      throw_toomany_arguments_nr("StaticResultWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("StaticResultWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_StaticResultWaitHandle::ti_create(char const*, HPHP::Variant const&)
-_ZN4HPHP24c_StaticResultWaitHandle9ti_createEPKcRKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-cls_ => rsi
-result => rdx
-*/
-
 Value* th_22StaticResultWaitHandle_create(Value* _rv, char const* cls_, TypedValue* result) asm("_ZN4HPHP24c_StaticResultWaitHandle9ti_createEPKcRKNS_7VariantE");
 
-TypedValue* tg_22StaticResultWaitHandle_create(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfObject;
-      th_22StaticResultWaitHandle_create((&rv.m_data), ("StaticResultWaitHandle"), (args-0));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("StaticResultWaitHandle::create", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* tg_22StaticResultWaitHandle_create(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (count == 1) {
+    rv->m_type = KindOfObject;
+    th_22StaticResultWaitHandle_create(&(rv->m_data), "StaticResultWaitHandle", (args-0));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_wrong_arguments_nr("StaticResultWaitHandle::create", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_result_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_wait_handle.ext_hhvm.cpp

@@ -14,53 +14,41 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
 IMPLEMENT_CLASS(StaticWaitHandle);
-/*
-void HPHP::c_StaticWaitHandle::t___construct()
-_ZN4HPHP18c_StaticWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_16StaticWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP18c_StaticWaitHandle13t___constructEv");
 
-TypedValue* tg_16StaticWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_16StaticWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("StaticWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_16StaticWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_16StaticWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("StaticWaitHandle::__construct");
+      throw_toomany_arguments_nr("StaticWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("StaticWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/static_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/wait_handle.ext_hhvm.cpp

@@ -14,384 +14,269 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
 IMPLEMENT_CLASS(WaitHandle);
-/*
-void HPHP::c_WaitHandle::t___construct()
-_ZN4HPHP12c_WaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_10WaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle13t___constructEv");
 
-TypedValue* tg_10WaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_10WaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_10WaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_10WaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("WaitHandle::__construct");
+      throw_toomany_arguments_nr("WaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_WaitHandle::t_getwaithandle()
-_ZN4HPHP12c_WaitHandle15t_getwaithandleEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_10WaitHandle_getWaitHandle(Value* _rv, ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle15t_getwaithandleEv");
 
-TypedValue* tg_10WaitHandle_getWaitHandle(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfObject;
-        th_10WaitHandle_getWaitHandle((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::getWaitHandle", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_getWaitHandle(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfObject;
+      th_10WaitHandle_getWaitHandle(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitHandle::getWaitHandle");
+      throw_toomany_arguments_nr("WaitHandle::getWaitHandle", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::getWaitHandle");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_WaitHandle::t_import()
-_ZN4HPHP12c_WaitHandle8t_importEv
-
-this_ => rdi
-*/
-
 void th_10WaitHandle_import(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle8t_importEv");
 
-TypedValue* tg_10WaitHandle_import(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_10WaitHandle_import((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::import", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_import(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_10WaitHandle_import((this_));
     } else {
-      throw_instance_method_fatal("WaitHandle::import");
+      throw_toomany_arguments_nr("WaitHandle::import", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::import");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Variant HPHP::c_WaitHandle::t_join()
-_ZN4HPHP12c_WaitHandle6t_joinEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 TypedValue* th_10WaitHandle_join(TypedValue* _rv, ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle6t_joinEv");
 
-TypedValue* tg_10WaitHandle_join(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        th_10WaitHandle_join((&(rv)), (this_));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::join", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_join(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      th_10WaitHandle_join(rv, (this_));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitHandle::join");
+      throw_toomany_arguments_nr("WaitHandle::join", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::join");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_WaitHandle::t_isfinished()
-_ZN4HPHP12c_WaitHandle12t_isfinishedEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 bool th_10WaitHandle_isFinished(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle12t_isfinishedEv");
 
-TypedValue* tg_10WaitHandle_isFinished(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (th_10WaitHandle_isFinished((this_))) ? 1LL : 0LL;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::isFinished", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_isFinished(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (th_10WaitHandle_isFinished((this_))) ? 1LL : 0LL;
     } else {
-      throw_instance_method_fatal("WaitHandle::isFinished");
+      throw_toomany_arguments_nr("WaitHandle::isFinished", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::isFinished");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_WaitHandle::t_issucceeded()
-_ZN4HPHP12c_WaitHandle13t_issucceededEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 bool th_10WaitHandle_isSucceeded(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle13t_issucceededEv");
 
-TypedValue* tg_10WaitHandle_isSucceeded(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (th_10WaitHandle_isSucceeded((this_))) ? 1LL : 0LL;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::isSucceeded", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_isSucceeded(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (th_10WaitHandle_isSucceeded((this_))) ? 1LL : 0LL;
     } else {
-      throw_instance_method_fatal("WaitHandle::isSucceeded");
+      throw_toomany_arguments_nr("WaitHandle::isSucceeded", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::isSucceeded");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_WaitHandle::t_isfailed()
-_ZN4HPHP12c_WaitHandle10t_isfailedEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 bool th_10WaitHandle_isFailed(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle10t_isfailedEv");
 
-TypedValue* tg_10WaitHandle_isFailed(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (th_10WaitHandle_isFailed((this_))) ? 1LL : 0LL;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::isFailed", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_isFailed(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (th_10WaitHandle_isFailed((this_))) ? 1LL : 0LL;
     } else {
-      throw_instance_method_fatal("WaitHandle::isFailed");
+      throw_toomany_arguments_nr("WaitHandle::isFailed", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::isFailed");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-long HPHP::c_WaitHandle::t_getid()
-_ZN4HPHP12c_WaitHandle7t_getidEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 long th_10WaitHandle_getID(ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle7t_getidEv");
 
-TypedValue* tg_10WaitHandle_getID(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfInt64;
-        rv.m_data.num = (int64_t)th_10WaitHandle_getID((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::getID", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_getID(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfInt64;
+      rv->m_data.num = (int64_t)th_10WaitHandle_getID((this_));
     } else {
-      throw_instance_method_fatal("WaitHandle::getID");
+      throw_toomany_arguments_nr("WaitHandle::getID", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::getID");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_WaitHandle::t_getname()
-_ZN4HPHP12c_WaitHandle9t_getnameEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_10WaitHandle_getName(Value* _rv, ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle9t_getnameEv");
 
-TypedValue* tg_10WaitHandle_getName(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfString;
-        th_10WaitHandle_getName((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::getName", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_getName(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfString;
+      th_10WaitHandle_getName(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitHandle::getName");
+      throw_toomany_arguments_nr("WaitHandle::getName", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::getName");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_WaitHandle::t_getexceptioniffailed()
-_ZN4HPHP12c_WaitHandle22t_getexceptioniffailedEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_10WaitHandle_getExceptionIfFailed(Value* _rv, ObjectData* this_) asm("_ZN4HPHP12c_WaitHandle22t_getexceptioniffailedEv");
 
-TypedValue* tg_10WaitHandle_getExceptionIfFailed(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfObject;
-        th_10WaitHandle_getExceptionIfFailed((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitHandle::getExceptionIfFailed", 0, 1);
-      }
+TypedValue* tg_10WaitHandle_getExceptionIfFailed(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfObject;
+      th_10WaitHandle_getExceptionIfFailed(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitHandle::getExceptionIfFailed");
+      throw_toomany_arguments_nr("WaitHandle::getExceptionIfFailed", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitHandle::getExceptionIfFailed");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/waitable_wait_handle.ext_hhvm.cpp

@@ -14,203 +14,144 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
 IMPLEMENT_CLASS(WaitableWaitHandle);
-/*
-void HPHP::c_WaitableWaitHandle::t___construct()
-_ZN4HPHP20c_WaitableWaitHandle13t___constructEv
-
-this_ => rdi
-*/
-
 void th_18WaitableWaitHandle___construct(ObjectData* this_) asm("_ZN4HPHP20c_WaitableWaitHandle13t___constructEv");
 
-TypedValue* tg_18WaitableWaitHandle___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_18WaitableWaitHandle___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitableWaitHandle::__construct", 0, 1);
-      }
+TypedValue* tg_18WaitableWaitHandle___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_18WaitableWaitHandle___construct((this_));
     } else {
-      throw_instance_method_fatal("WaitableWaitHandle::__construct");
+      throw_toomany_arguments_nr("WaitableWaitHandle::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitableWaitHandle::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-int HPHP::c_WaitableWaitHandle::t_getcontextidx()
-_ZN4HPHP20c_WaitableWaitHandle15t_getcontextidxEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 int th_18WaitableWaitHandle_getContextIdx(ObjectData* this_) asm("_ZN4HPHP20c_WaitableWaitHandle15t_getcontextidxEv");
 
-TypedValue* tg_18WaitableWaitHandle_getContextIdx(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfInt64;
-        rv.m_data.num = (int64_t)th_18WaitableWaitHandle_getContextIdx((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitableWaitHandle::getContextIdx", 0, 1);
-      }
+TypedValue* tg_18WaitableWaitHandle_getContextIdx(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfInt64;
+      rv->m_data.num = (int64_t)th_18WaitableWaitHandle_getContextIdx((this_));
     } else {
-      throw_instance_method_fatal("WaitableWaitHandle::getContextIdx");
+      throw_toomany_arguments_nr("WaitableWaitHandle::getContextIdx", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitableWaitHandle::getContextIdx");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_WaitableWaitHandle::t_getcreator()
-_ZN4HPHP20c_WaitableWaitHandle12t_getcreatorEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_18WaitableWaitHandle_getCreator(Value* _rv, ObjectData* this_) asm("_ZN4HPHP20c_WaitableWaitHandle12t_getcreatorEv");
 
-TypedValue* tg_18WaitableWaitHandle_getCreator(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfObject;
-        th_18WaitableWaitHandle_getCreator((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitableWaitHandle::getCreator", 0, 1);
-      }
+TypedValue* tg_18WaitableWaitHandle_getCreator(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfObject;
+      th_18WaitableWaitHandle_getCreator(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitableWaitHandle::getCreator");
+      throw_toomany_arguments_nr("WaitableWaitHandle::getCreator", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitableWaitHandle::getCreator");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Array HPHP::c_WaitableWaitHandle::t_getparents()
-_ZN4HPHP20c_WaitableWaitHandle12t_getparentsEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_18WaitableWaitHandle_getParents(Value* _rv, ObjectData* this_) asm("_ZN4HPHP20c_WaitableWaitHandle12t_getparentsEv");
 
-TypedValue* tg_18WaitableWaitHandle_getParents(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfArray;
-        th_18WaitableWaitHandle_getParents((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitableWaitHandle::getParents", 0, 1);
-      }
+TypedValue* tg_18WaitableWaitHandle_getParents(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfArray;
+      th_18WaitableWaitHandle_getParents(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitableWaitHandle::getParents");
+      throw_toomany_arguments_nr("WaitableWaitHandle::getParents", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitableWaitHandle::getParents");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Array HPHP::c_WaitableWaitHandle::t_getstacktrace()
-_ZN4HPHP20c_WaitableWaitHandle15t_getstacktraceEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_18WaitableWaitHandle_getStackTrace(Value* _rv, ObjectData* this_) asm("_ZN4HPHP20c_WaitableWaitHandle15t_getstacktraceEv");
 
-TypedValue* tg_18WaitableWaitHandle_getStackTrace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfArray;
-        th_18WaitableWaitHandle_getStackTrace((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("WaitableWaitHandle::getStackTrace", 0, 1);
-      }
+TypedValue* tg_18WaitableWaitHandle_getStackTrace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfArray;
+      th_18WaitableWaitHandle_getStackTrace(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("WaitableWaitHandle::getStackTrace");
+      throw_toomany_arguments_nr("WaitableWaitHandle::getStackTrace", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("WaitableWaitHandle::getStackTrace");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/asio/waitable_wait_handle.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_apache.ext_hhvm.cpp

@@ -14,30 +14,21 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_apache_note(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP13f_apache_noteERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-note_name => rsi
-note_value => rdx
-*/
-
 TypedValue* fh_apache_note(TypedValue* _rv, Value* note_name, Value* note_value) asm("_ZN4HPHP13f_apache_noteERKNS_6StringES2_");
 
-TypedValue * fg1_apache_note(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_apache_note(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_apache_note(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_apache_note(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 2
@@ -50,125 +41,80 @@ TypedValue * fg1_apache_note(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_apache_note((rv), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+  fh_apache_note(rv, &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_apache_note(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || IS_STRING_TYPE((args-1)->m_type)) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_apache_note((&(rv)), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_apache_note(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_apache_note(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || IS_STRING_TYPE((args - 1)->m_type)) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_apache_note(rv, &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("apache_note", count, 1, 2, 1);
+      fg1_apache_note(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("apache_note", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_apache_request_headers()
-_ZN4HPHP24f_apache_request_headersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_apache_request_headers(Value* _rv) asm("_ZN4HPHP24f_apache_request_headersEv");
 
-TypedValue* fg_apache_request_headers(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfArray;
-      fh_apache_request_headers((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apache_request_headers", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apache_request_headers(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfArray;
+    fh_apache_request_headers(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("apache_request_headers", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_apache_response_headers()
-_ZN4HPHP25f_apache_response_headersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_apache_response_headers(Value* _rv) asm("_ZN4HPHP25f_apache_response_headersEv");
 
-TypedValue* fg_apache_response_headers(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfArray;
-      fh_apache_response_headers((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apache_response_headers", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apache_response_headers(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfArray;
+    fh_apache_response_headers(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("apache_response_headers", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_apache_setenv(HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP15f_apache_setenvERKNS_6StringES2_b
-
-(return value) => rax
-variable => rdi
-value => rsi
-walk_to_top => rdx
-*/
-
 bool fh_apache_setenv(Value* variable, Value* value, bool walk_to_top) asm("_ZN4HPHP15f_apache_setenvERKNS_6StringES2_b");
 
-TypedValue * fg1_apache_setenv(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_apache_setenv(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_apache_setenv(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_apache_setenv(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfBoolean) {
@@ -183,222 +129,145 @@ TypedValue * fg1_apache_setenv(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_apache_setenv(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (bool)(args[-2].m_data.num) : (bool)(false))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_apache_setenv(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfBoolean) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_apache_setenv(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (bool)(args[-2].m_data.num) : (bool)(false))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_apache_setenv(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_apache_setenv(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfBoolean) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_apache_setenv(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (bool)(args[-2].m_data.num) : (bool)(false))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("apache_setenv", count, 2, 3, 1);
+      fg1_apache_setenv(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("apache_setenv", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_getallheaders()
-_ZN4HPHP15f_getallheadersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_getallheaders(Value* _rv) asm("_ZN4HPHP15f_getallheadersEv");
 
-TypedValue* fg_getallheaders(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfArray;
-      fh_getallheaders((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("getallheaders", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_getallheaders(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfArray;
+    fh_getallheaders(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("getallheaders", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_virtual(HPHP::String const&)
-_ZN4HPHP9f_virtualERKNS_6StringE
-
-(return value) => rax
-filename => rdi
-*/
-
 bool fh_virtual(Value* filename) asm("_ZN4HPHP9f_virtualERKNS_6StringE");
 
-TypedValue * fg1_virtual(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_virtual(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_virtual(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_virtual(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_virtual(&args[-0].m_data)) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_virtual(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_virtual(&args[-0].m_data)) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_virtual(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_virtual(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_virtual(&args[-0].m_data)) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("virtual", count, 1, 1, 1);
+      fg1_virtual(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("virtual", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_apache_get_config()
-_ZN4HPHP19f_apache_get_configEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_config(TypedValue* _rv) asm("_ZN4HPHP19f_apache_get_configEv");
 
-TypedValue* fg_apache_get_config(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_apache_get_config((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apache_get_config", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apache_get_config(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    fh_apache_get_config(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("apache_get_config", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_apache_get_scoreboard()
-_ZN4HPHP23f_apache_get_scoreboardEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_scoreboard(TypedValue* _rv) asm("_ZN4HPHP23f_apache_get_scoreboardEv");
 
-TypedValue* fg_apache_get_scoreboard(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_apache_get_scoreboard((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apache_get_scoreboard", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apache_get_scoreboard(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    fh_apache_get_scoreboard(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("apache_get_scoreboard", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_apache_get_rewrite_rules()
-_ZN4HPHP26f_apache_get_rewrite_rulesEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_rewrite_rules(TypedValue* _rv) asm("_ZN4HPHP26f_apache_get_rewrite_rulesEv");
 
-TypedValue* fg_apache_get_rewrite_rules(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_apache_get_rewrite_rules((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apache_get_rewrite_rules", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apache_get_rewrite_rules(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    fh_apache_get_rewrite_rules(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("apache_get_rewrite_rules", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_apache.ext_hhvm.h

@@ -16,100 +16,22 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_apache_note(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP13f_apache_noteERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-note_name => rsi
-note_value => rdx
-*/
-
 TypedValue* fh_apache_note(TypedValue* _rv, Value* note_name, Value* note_value) asm("_ZN4HPHP13f_apache_noteERKNS_6StringES2_");
 
-/*
-HPHP::Array HPHP::f_apache_request_headers()
-_ZN4HPHP24f_apache_request_headersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_apache_request_headers(Value* _rv) asm("_ZN4HPHP24f_apache_request_headersEv");
 
-/*
-HPHP::Array HPHP::f_apache_response_headers()
-_ZN4HPHP25f_apache_response_headersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_apache_response_headers(Value* _rv) asm("_ZN4HPHP25f_apache_response_headersEv");
 
-/*
-bool HPHP::f_apache_setenv(HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP15f_apache_setenvERKNS_6StringES2_b
-
-(return value) => rax
-variable => rdi
-value => rsi
-walk_to_top => rdx
-*/
-
 bool fh_apache_setenv(Value* variable, Value* value, bool walk_to_top) asm("_ZN4HPHP15f_apache_setenvERKNS_6StringES2_b");
 
-/*
-HPHP::Array HPHP::f_getallheaders()
-_ZN4HPHP15f_getallheadersEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_getallheaders(Value* _rv) asm("_ZN4HPHP15f_getallheadersEv");
 
-/*
-bool HPHP::f_virtual(HPHP::String const&)
-_ZN4HPHP9f_virtualERKNS_6StringE
-
-(return value) => rax
-filename => rdi
-*/
-
 bool fh_virtual(Value* filename) asm("_ZN4HPHP9f_virtualERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_apache_get_config()
-_ZN4HPHP19f_apache_get_configEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_config(TypedValue* _rv) asm("_ZN4HPHP19f_apache_get_configEv");
 
-/*
-HPHP::Variant HPHP::f_apache_get_scoreboard()
-_ZN4HPHP23f_apache_get_scoreboardEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_scoreboard(TypedValue* _rv) asm("_ZN4HPHP23f_apache_get_scoreboardEv");
 
-/*
-HPHP::Variant HPHP::f_apache_get_rewrite_rules()
-_ZN4HPHP26f_apache_get_rewrite_rulesEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_apache_get_rewrite_rules(TypedValue* _rv) asm("_ZN4HPHP26f_apache_get_rewrite_rulesEv");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_apc.ext_hhvm.h

@@ -16,254 +16,44 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_apc_add(HPHP::String const&, HPHP::Variant const&, long, long)
-_ZN4HPHP9f_apc_addERKNS_6StringERKNS_7VariantEll
-
-(return value) => rax
-key => rdi
-var => rsi
-ttl => rdx
-cache_id => rcx
-*/
+bool fh_apc_store(Value* key, TypedValue* var, long ttl, long cache_id) asm("_ZN4HPHP11f_apc_storeERKNS_6StringERKNS_7VariantEll");
 
 bool fh_apc_add(Value* key, TypedValue* var, long ttl, long cache_id) asm("_ZN4HPHP9f_apc_addERKNS_6StringERKNS_7VariantEll");
 
-/*
-bool HPHP::f_apc_store(HPHP::String const&, HPHP::Variant const&, long, long)
-_ZN4HPHP11f_apc_storeERKNS_6StringERKNS_7VariantEll
-
-(return value) => rax
-key => rdi
-var => rsi
-ttl => rdx
-cache_id => rcx
-*/
-
-bool fh_apc_store(Value* key, TypedValue* var, long ttl, long cache_id) asm("_ZN4HPHP11f_apc_storeERKNS_6StringERKNS_7VariantEll");
-
-/*
-HPHP::Variant HPHP::f_apc_fetch(HPHP::Variant const&, HPHP::VRefParamValue const&, long)
-_ZN4HPHP11f_apc_fetchERKNS_7VariantERKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-key => rsi
-success => rdx
-cache_id => rcx
-*/
-
 TypedValue* fh_apc_fetch(TypedValue* _rv, TypedValue* key, TypedValue* success, long cache_id) asm("_ZN4HPHP11f_apc_fetchERKNS_7VariantERKNS_14VRefParamValueEl");
 
-/*
-HPHP::Variant HPHP::f_apc_delete(HPHP::Variant const&, long)
-_ZN4HPHP12f_apc_deleteERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-key => rsi
-cache_id => rdx
-*/
-
 TypedValue* fh_apc_delete(TypedValue* _rv, TypedValue* key, long cache_id) asm("_ZN4HPHP12f_apc_deleteERKNS_7VariantEl");
 
-/*
-bool HPHP::f_apc_compile_file(HPHP::String const&, bool, long)
-_ZN4HPHP18f_apc_compile_fileERKNS_6StringEbl
-
-(return value) => rax
-filename => rdi
-atomic => rsi
-cache_id => rdx
-*/
-
-bool fh_apc_compile_file(Value* filename, bool atomic, long cache_id) asm("_ZN4HPHP18f_apc_compile_fileERKNS_6StringEbl");
-
-/*
-HPHP::Variant HPHP::f_apc_cache_info(long, bool)
-_ZN4HPHP16f_apc_cache_infoElb
-
-(return value) => rax
-_rv => rdi
-cache_id => rsi
-limited => rdx
-*/
-
-TypedValue* fh_apc_cache_info(TypedValue* _rv, long cache_id, bool limited) asm("_ZN4HPHP16f_apc_cache_infoElb");
-
-/*
-bool HPHP::f_apc_clear_cache(long)
-_ZN4HPHP17f_apc_clear_cacheEl
-
-(return value) => rax
-cache_id => rdi
-*/
-
 bool fh_apc_clear_cache(long cache_id) asm("_ZN4HPHP17f_apc_clear_cacheEl");
 
-/*
-bool HPHP::f_apc_define_constants(HPHP::String const&, HPHP::String const&, bool, long)
-_ZN4HPHP22f_apc_define_constantsERKNS_6StringES2_bl
-
-(return value) => rax
-key => rdi
-constants => rsi
-case_sensitive => rdx
-cache_id => rcx
-*/
-
-bool fh_apc_define_constants(Value* key, Value* constants, bool case_sensitive, long cache_id) asm("_ZN4HPHP22f_apc_define_constantsERKNS_6StringES2_bl");
-
-/*
-bool HPHP::f_apc_load_constants(HPHP::String const&, bool, long)
-_ZN4HPHP20f_apc_load_constantsERKNS_6StringEbl
-
-(return value) => rax
-key => rdi
-case_sensitive => rsi
-cache_id => rdx
-*/
-
-bool fh_apc_load_constants(Value* key, bool case_sensitive, long cache_id) asm("_ZN4HPHP20f_apc_load_constantsERKNS_6StringEbl");
-
-/*
-HPHP::Array HPHP::f_apc_sma_info(bool)
-_ZN4HPHP14f_apc_sma_infoEb
-
-(return value) => rax
-_rv => rdi
-limited => rsi
-*/
-
-Value* fh_apc_sma_info(Value* _rv, bool limited) asm("_ZN4HPHP14f_apc_sma_infoEb");
-
-/*
-HPHP::Array HPHP::f_apc_filehits()
-_ZN4HPHP14f_apc_filehitsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_apc_filehits(Value* _rv) asm("_ZN4HPHP14f_apc_filehitsEv");
-
-/*
-HPHP::Variant HPHP::f_apc_delete_file(HPHP::Variant const&, long)
-_ZN4HPHP17f_apc_delete_fileERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-keys => rsi
-cache_id => rdx
-*/
-
-TypedValue* fh_apc_delete_file(TypedValue* _rv, TypedValue* keys, long cache_id) asm("_ZN4HPHP17f_apc_delete_fileERKNS_7VariantEl");
-
-/*
-HPHP::Variant HPHP::f_apc_inc(HPHP::String const&, long, HPHP::VRefParamValue const&, long)
-_ZN4HPHP9f_apc_incERKNS_6StringElRKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-key => rsi
-step => rdx
-success => rcx
-cache_id => r8
-*/
-
 TypedValue* fh_apc_inc(TypedValue* _rv, Value* key, long step, TypedValue* success, long cache_id) asm("_ZN4HPHP9f_apc_incERKNS_6StringElRKNS_14VRefParamValueEl");
 
-/*
-HPHP::Variant HPHP::f_apc_dec(HPHP::String const&, long, HPHP::VRefParamValue const&, long)
-_ZN4HPHP9f_apc_decERKNS_6StringElRKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-key => rsi
-step => rdx
-success => rcx
-cache_id => r8
-*/
-
 TypedValue* fh_apc_dec(TypedValue* _rv, Value* key, long step, TypedValue* success, long cache_id) asm("_ZN4HPHP9f_apc_decERKNS_6StringElRKNS_14VRefParamValueEl");
 
-/*
-bool HPHP::f_apc_cas(HPHP::String const&, long, long, long)
-_ZN4HPHP9f_apc_casERKNS_6StringElll
-
-(return value) => rax
-key => rdi
-old_cas => rsi
-new_cas => rdx
-cache_id => rcx
-*/
-
 bool fh_apc_cas(Value* key, long old_cas, long new_cas, long cache_id) asm("_ZN4HPHP9f_apc_casERKNS_6StringElll");
 
-/*
-HPHP::Variant HPHP::f_apc_exists(HPHP::Variant const&, long)
-_ZN4HPHP12f_apc_existsERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-key => rsi
-cache_id => rdx
-*/
-
 TypedValue* fh_apc_exists(TypedValue* _rv, TypedValue* key, long cache_id) asm("_ZN4HPHP12f_apc_existsERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_apc_bin_dump(long, HPHP::Variant const&)
-_ZN4HPHP14f_apc_bin_dumpElRKNS_7VariantE
+TypedValue* fh_apc_cache_info(TypedValue* _rv, long cache_id, bool limited) asm("_ZN4HPHP16f_apc_cache_infoElb");
 
-(return value) => rax
-_rv => rdi
-cache_id => rsi
-filter => rdx
-*/
+Value* fh_apc_sma_info(Value* _rv, bool limited) asm("_ZN4HPHP14f_apc_sma_infoEb");
+
+bool fh_apc_define_constants(Value* key, Value* constants, bool case_sensitive, long cache_id) asm("_ZN4HPHP22f_apc_define_constantsERKNS_6StringES2_bl");
+
+bool fh_apc_load_constants(Value* key, bool case_sensitive, long cache_id) asm("_ZN4HPHP20f_apc_load_constantsERKNS_6StringEbl");
+
+bool fh_apc_compile_file(Value* filename, bool atomic, long cache_id) asm("_ZN4HPHP18f_apc_compile_fileERKNS_6StringEbl");
+
+Value* fh_apc_filehits(Value* _rv) asm("_ZN4HPHP14f_apc_filehitsEv");
+
+TypedValue* fh_apc_delete_file(TypedValue* _rv, TypedValue* keys, long cache_id) asm("_ZN4HPHP17f_apc_delete_fileERKNS_7VariantEl");
 
 TypedValue* fh_apc_bin_dump(TypedValue* _rv, long cache_id, TypedValue* filter) asm("_ZN4HPHP14f_apc_bin_dumpElRKNS_7VariantE");
 
-/*
-bool HPHP::f_apc_bin_load(HPHP::String const&, long, long)
-_ZN4HPHP14f_apc_bin_loadERKNS_6StringEll
-
-(return value) => rax
-data => rdi
-flags => rsi
-cache_id => rdx
-*/
-
 bool fh_apc_bin_load(Value* data, long flags, long cache_id) asm("_ZN4HPHP14f_apc_bin_loadERKNS_6StringEll");
 
-/*
-HPHP::Variant HPHP::f_apc_bin_dumpfile(long, HPHP::Variant const&, HPHP::String const&, long, HPHP::Object const&)
-_ZN4HPHP18f_apc_bin_dumpfileElRKNS_7VariantERKNS_6StringElRKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-cache_id => rsi
-filter => rdx
-filename => rcx
-flags => r8
-context => r9
-*/
-
 TypedValue* fh_apc_bin_dumpfile(TypedValue* _rv, long cache_id, TypedValue* filter, Value* filename, long flags, Value* context) asm("_ZN4HPHP18f_apc_bin_dumpfileElRKNS_7VariantERKNS_6StringElRKNS_6ObjectE");
 
-/*
-bool HPHP::f_apc_bin_loadfile(HPHP::String const&, HPHP::Object const&, long, long)
-_ZN4HPHP18f_apc_bin_loadfileERKNS_6StringERKNS_6ObjectEll
-
-(return value) => rax
-filename => rdi
-context => rsi
-flags => rdx
-cache_id => rcx
-*/
-
 bool fh_apc_bin_loadfile(Value* filename, Value* context, long flags, long cache_id) asm("_ZN4HPHP18f_apc_bin_loadfileERKNS_6StringERKNS_6ObjectEll");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_apd.ext_hhvm.cpp

@@ -14,32 +14,22 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-bool HPHP::f_override_function(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP19f_override_functionERKNS_6StringES2_S2_
-
-(return value) => rax
-name => rdi
-args => rsi
-code => rdx
-*/
-
 bool fh_override_function(Value* name, Value* args, Value* code) asm("_ZN4HPHP19f_override_functionERKNS_6StringES2_S2_");
 
-TypedValue * fg1_override_function(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_override_function(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_override_function(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_override_function(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   if (!IS_STRING_TYPE((args-2)->m_type)) {
     tvCastToStringInPlace(args-2);
   }
@@ -49,143 +39,97 @@ TypedValue * fg1_override_function(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_override_function(&args[-0].m_data, &args[-1].m_data, &args[-2].m_data)) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_override_function(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 3LL) {
-      if (IS_STRING_TYPE((args-2)->m_type) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_override_function(&args[-0].m_data, &args[-1].m_data, &args[-2].m_data)) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_override_function(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_override_function(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 3) {
+    if (IS_STRING_TYPE((args - 2)->m_type) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_override_function(&args[-0].m_data, &args[-1].m_data, &args[-2].m_data)) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("override_function", count, 3, 3, 1);
+      fg1_override_function(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("override_function", count, 3, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_rename_function(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP17f_rename_functionERKNS_6StringES2_
-
-(return value) => rax
-orig_name => rdi
-new_name => rsi
-*/
-
 bool fh_rename_function(Value* orig_name, Value* new_name) asm("_ZN4HPHP17f_rename_functionERKNS_6StringES2_");
 
-TypedValue * fg1_rename_function(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_rename_function(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_rename_function(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_rename_function(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   if (!IS_STRING_TYPE((args-1)->m_type)) {
     tvCastToStringInPlace(args-1);
   }
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_rename_function(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_rename_function(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if (IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_rename_function(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_rename_function(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_rename_function(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if (IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_rename_function(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("rename_function", count, 2, 2, 1);
+      fg1_rename_function(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("rename_function", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_apd_set_browser_trace()
-_ZN4HPHP23f_apd_set_browser_traceEv
-
-*/
-
 void fh_apd_set_browser_trace() asm("_ZN4HPHP23f_apd_set_browser_traceEv");
 
-TypedValue* fg_apd_set_browser_trace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_apd_set_browser_trace();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apd_set_browser_trace", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apd_set_browser_trace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_apd_set_browser_trace();
+  } else {
+    throw_toomany_arguments_nr("apd_set_browser_trace", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_apd_set_pprof_trace(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP21f_apd_set_pprof_traceERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-dumpdir => rsi
-frament => rdx
-*/
-
 Value* fh_apd_set_pprof_trace(Value* _rv, Value* dumpdir, Value* frament) asm("_ZN4HPHP21f_apd_set_pprof_traceERKNS_6StringES2_");
 
-TypedValue * fg1_apd_set_pprof_trace(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_apd_set_pprof_trace(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_apd_set_pprof_trace(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_apd_set_pprof_trace(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 2
     if (!IS_STRING_TYPE((args-1)->m_type)) {
@@ -198,59 +142,40 @@ TypedValue * fg1_apd_set_pprof_trace(TypedValue* rv, ActRec* ar, int64_t count)
   case 0:
     break;
   }
-  fh_apd_set_pprof_trace((&rv->m_data), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+  rv->m_type = KindOfString;
+  fh_apd_set_pprof_trace(&(rv->m_data), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_apd_set_pprof_trace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count <= 2LL) {
-      if ((count <= 1 || IS_STRING_TYPE((args-1)->m_type)) && (count <= 0 || IS_STRING_TYPE((args-0)->m_type))) {
-        rv.m_type = KindOfString;
-        fh_apd_set_pprof_trace((&rv.m_data), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_apd_set_pprof_trace(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_apd_set_pprof_trace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count <= 2) {
+    if ((count <= 1 || IS_STRING_TYPE((args - 1)->m_type)) &&
+        (count <= 0 || IS_STRING_TYPE((args - 0)->m_type))) {
+      rv->m_type = KindOfString;
+      fh_apd_set_pprof_trace(&(rv->m_data), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_toomany_arguments_nr("apd_set_pprof_trace", 2, 1);
+      fg1_apd_set_pprof_trace(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_toomany_arguments_nr("apd_set_pprof_trace", 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_apd_set_session_trace_socket(HPHP::String const&, int, int, int)
-_ZN4HPHP30f_apd_set_session_trace_socketERKNS_6StringEiii
-
-(return value) => rax
-ip_or_filename => rdi
-domain => rsi
-port => rdx
-mask => rcx
-*/
-
 bool fh_apd_set_session_trace_socket(Value* ip_or_filename, int domain, int port, int mask) asm("_ZN4HPHP30f_apd_set_session_trace_socketERKNS_6StringEiii");
 
-TypedValue * fg1_apd_set_session_trace_socket(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_apd_set_session_trace_socket(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_apd_set_session_trace_socket(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_apd_set_session_trace_socket(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   if ((args-3)->m_type != KindOfInt64) {
     tvCastToInt64InPlace(args-3);
   }
@@ -263,185 +188,125 @@ TypedValue * fg1_apd_set_session_trace_socket(TypedValue* rv, ActRec* ar, int64_
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_apd_set_session_trace_socket(&args[-0].m_data, (int)(args[-1].m_data.num), (int)(args[-2].m_data.num), (int)(args[-3].m_data.num))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_apd_set_session_trace_socket(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 4LL) {
-      if ((args-3)->m_type == KindOfInt64 && (args-2)->m_type == KindOfInt64 && (args-1)->m_type == KindOfInt64 && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_apd_set_session_trace_socket(&args[-0].m_data, (int)(args[-1].m_data.num), (int)(args[-2].m_data.num), (int)(args[-3].m_data.num))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_apd_set_session_trace_socket(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_apd_set_session_trace_socket(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 4) {
+    if ((args - 3)->m_type == KindOfInt64 &&
+        (args - 2)->m_type == KindOfInt64 &&
+        (args - 1)->m_type == KindOfInt64 &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_apd_set_session_trace_socket(&args[-0].m_data, (int)(args[-1].m_data.num), (int)(args[-2].m_data.num), (int)(args[-3].m_data.num))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("apd_set_session_trace_socket", count, 4, 4, 1);
+      fg1_apd_set_session_trace_socket(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("apd_set_session_trace_socket", count, 4, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_apd_stop_trace()
-_ZN4HPHP16f_apd_stop_traceEv
-
-*/
-
 void fh_apd_stop_trace() asm("_ZN4HPHP16f_apd_stop_traceEv");
 
-TypedValue* fg_apd_stop_trace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_apd_stop_trace();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apd_stop_trace", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apd_stop_trace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_apd_stop_trace();
+  } else {
+    throw_toomany_arguments_nr("apd_stop_trace", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_apd_breakpoint()
-_ZN4HPHP16f_apd_breakpointEv
-
-(return value) => rax
-*/
-
 bool fh_apd_breakpoint() asm("_ZN4HPHP16f_apd_breakpointEv");
 
-TypedValue* fg_apd_breakpoint(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_apd_breakpoint()) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apd_breakpoint", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apd_breakpoint(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_apd_breakpoint()) ? 1LL : 0LL;
+  } else {
+    throw_toomany_arguments_nr("apd_breakpoint", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_apd_continue()
-_ZN4HPHP14f_apd_continueEv
-
-(return value) => rax
-*/
-
 bool fh_apd_continue() asm("_ZN4HPHP14f_apd_continueEv");
 
-TypedValue* fg_apd_continue(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_apd_continue()) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("apd_continue", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_apd_continue(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_apd_continue()) ? 1LL : 0LL;
+  } else {
+    throw_toomany_arguments_nr("apd_continue", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_apd_echo(HPHP::String const&)
-_ZN4HPHP10f_apd_echoERKNS_6StringE
-
-(return value) => rax
-output => rdi
-*/
-
 bool fh_apd_echo(Value* output) asm("_ZN4HPHP10f_apd_echoERKNS_6StringE");
 
-TypedValue * fg1_apd_echo(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_apd_echo(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_apd_echo(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_apd_echo(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_apd_echo(&args[-0].m_data)) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_apd_echo(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_apd_echo(&args[-0].m_data)) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_apd_echo(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_apd_echo(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_apd_echo(&args[-0].m_data)) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("apd_echo", count, 1, 1, 1);
+      fg1_apd_echo(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("apd_echo", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_apd.ext_hhvm.h

@@ -16,98 +16,22 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_override_function(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP19f_override_functionERKNS_6StringES2_S2_
-
-(return value) => rax
-name => rdi
-args => rsi
-code => rdx
-*/
-
 bool fh_override_function(Value* name, Value* args, Value* code) asm("_ZN4HPHP19f_override_functionERKNS_6StringES2_S2_");
 
-/*
-bool HPHP::f_rename_function(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP17f_rename_functionERKNS_6StringES2_
-
-(return value) => rax
-orig_name => rdi
-new_name => rsi
-*/
-
 bool fh_rename_function(Value* orig_name, Value* new_name) asm("_ZN4HPHP17f_rename_functionERKNS_6StringES2_");
 
-/*
-void HPHP::f_apd_set_browser_trace()
-_ZN4HPHP23f_apd_set_browser_traceEv
-
-*/
-
 void fh_apd_set_browser_trace() asm("_ZN4HPHP23f_apd_set_browser_traceEv");
 
-/*
-HPHP::String HPHP::f_apd_set_pprof_trace(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP21f_apd_set_pprof_traceERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-dumpdir => rsi
-frament => rdx
-*/
-
 Value* fh_apd_set_pprof_trace(Value* _rv, Value* dumpdir, Value* frament) asm("_ZN4HPHP21f_apd_set_pprof_traceERKNS_6StringES2_");
 
-/*
-bool HPHP::f_apd_set_session_trace_socket(HPHP::String const&, int, int, int)
-_ZN4HPHP30f_apd_set_session_trace_socketERKNS_6StringEiii
-
-(return value) => rax
-ip_or_filename => rdi
-domain => rsi
-port => rdx
-mask => rcx
-*/
-
 bool fh_apd_set_session_trace_socket(Value* ip_or_filename, int domain, int port, int mask) asm("_ZN4HPHP30f_apd_set_session_trace_socketERKNS_6StringEiii");
 
-/*
-void HPHP::f_apd_stop_trace()
-_ZN4HPHP16f_apd_stop_traceEv
-
-*/
-
 void fh_apd_stop_trace() asm("_ZN4HPHP16f_apd_stop_traceEv");
 
-/*
-bool HPHP::f_apd_breakpoint()
-_ZN4HPHP16f_apd_breakpointEv
-
-(return value) => rax
-*/
-
 bool fh_apd_breakpoint() asm("_ZN4HPHP16f_apd_breakpointEv");
 
-/*
-bool HPHP::f_apd_continue()
-_ZN4HPHP14f_apd_continueEv
-
-(return value) => rax
-*/
-
 bool fh_apd_continue() asm("_ZN4HPHP14f_apd_continueEv");
 
-/*
-bool HPHP::f_apd_echo(HPHP::String const&)
-_ZN4HPHP10f_apd_echoERKNS_6StringE
-
-(return value) => rax
-output => rdi
-*/
-
 bool fh_apd_echo(Value* output) asm("_ZN4HPHP10f_apd_echoERKNS_6StringE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_asio.ext_hhvm.cpp

@@ -14,298 +14,191 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-void HPHP::f_asio_enter_context()
-_ZN4HPHP20f_asio_enter_contextEv
-
-*/
-
 void fh_asio_enter_context() asm("_ZN4HPHP20f_asio_enter_contextEv");
 
-TypedValue* fg_asio_enter_context(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_asio_enter_context();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("asio_enter_context", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_enter_context(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_asio_enter_context();
+  } else {
+    throw_toomany_arguments_nr("asio_enter_context", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_asio_exit_context()
-_ZN4HPHP19f_asio_exit_contextEv
-
-*/
-
 void fh_asio_exit_context() asm("_ZN4HPHP19f_asio_exit_contextEv");
 
-TypedValue* fg_asio_exit_context(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_asio_exit_context();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("asio_exit_context", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_exit_context(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_asio_exit_context();
+  } else {
+    throw_toomany_arguments_nr("asio_exit_context", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-int HPHP::f_asio_get_current_context_idx()
-_ZN4HPHP30f_asio_get_current_context_idxEv
-
-(return value) => rax
-*/
-
 int fh_asio_get_current_context_idx() asm("_ZN4HPHP30f_asio_get_current_context_idxEv");
 
-TypedValue* fg_asio_get_current_context_idx(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfInt64;
-      rv.m_data.num = (int64_t)fh_asio_get_current_context_idx();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("asio_get_current_context_idx", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_get_current_context_idx(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfInt64;
+    rv->m_data.num = (int64_t)fh_asio_get_current_context_idx();
+  } else {
+    throw_toomany_arguments_nr("asio_get_current_context_idx", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Object HPHP::f_asio_get_running_in_context(int)
-_ZN4HPHP29f_asio_get_running_in_contextEi
-
-(return value) => rax
-_rv => rdi
-ctx_idx => rsi
-*/
-
 Value* fh_asio_get_running_in_context(Value* _rv, int ctx_idx) asm("_ZN4HPHP29f_asio_get_running_in_contextEi");
 
-TypedValue * fg1_asio_get_running_in_context(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_asio_get_running_in_context(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_asio_get_running_in_context(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_asio_get_running_in_context(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToInt64InPlace(args-0);
-  fh_asio_get_running_in_context((&rv->m_data), (int)(args[-0].m_data.num));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  fh_asio_get_running_in_context(&(rv->m_data), (int)(args[-0].m_data.num));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* fg_asio_get_running_in_context(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfInt64) {
-        rv.m_type = KindOfObject;
-        fh_asio_get_running_in_context((&rv.m_data), (int)(args[-0].m_data.num));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_asio_get_running_in_context(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_asio_get_running_in_context(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfInt64) {
+      rv->m_type = KindOfObject;
+      fh_asio_get_running_in_context(&(rv->m_data), (int)(args[-0].m_data.num));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("asio_get_running_in_context", count, 1, 1, 1);
+      fg1_asio_get_running_in_context(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("asio_get_running_in_context", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Object HPHP::f_asio_get_running()
-_ZN4HPHP18f_asio_get_runningEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_asio_get_running(Value* _rv) asm("_ZN4HPHP18f_asio_get_runningEv");
 
-TypedValue* fg_asio_get_running(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfObject;
-      fh_asio_get_running((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("asio_get_running", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_get_running(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfObject;
+    fh_asio_get_running(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("asio_get_running", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Object HPHP::f_asio_get_current()
-_ZN4HPHP18f_asio_get_currentEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_asio_get_current(Value* _rv) asm("_ZN4HPHP18f_asio_get_currentEv");
 
-TypedValue* fg_asio_get_current(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfObject;
-      fh_asio_get_current((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("asio_get_current", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_get_current(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfObject;
+    fh_asio_get_current(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("asio_get_current", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_asio_set_on_failed_callback(HPHP::Variant const&)
-_ZN4HPHP29f_asio_set_on_failed_callbackERKNS_7VariantE
-
-on_failed_cb => rdi
-*/
-
 void fh_asio_set_on_failed_callback(TypedValue* on_failed_cb) asm("_ZN4HPHP29f_asio_set_on_failed_callbackERKNS_7VariantE");
 
-TypedValue* fg_asio_set_on_failed_callback(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_asio_set_on_failed_callback((args-0));
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("asio_set_on_failed_callback", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_set_on_failed_callback(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfNull;
+    fh_asio_set_on_failed_callback((args-0));
+  } else {
+    throw_wrong_arguments_nr("asio_set_on_failed_callback", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_asio_set_on_started_callback(HPHP::Variant const&)
-_ZN4HPHP30f_asio_set_on_started_callbackERKNS_7VariantE
-
-on_started_cb => rdi
-*/
-
 void fh_asio_set_on_started_callback(TypedValue* on_started_cb) asm("_ZN4HPHP30f_asio_set_on_started_callbackERKNS_7VariantE");
 
-TypedValue* fg_asio_set_on_started_callback(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_asio_set_on_started_callback((args-0));
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("asio_set_on_started_callback", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_asio_set_on_started_callback(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfNull;
+    fh_asio_set_on_started_callback((args-0));
+  } else {
+    throw_wrong_arguments_nr("asio_set_on_started_callback", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_asio.ext_hhvm.h

@@ -16,80 +16,20 @@
 */
 namespace HPHP {
 
-/*
-void HPHP::f_asio_enter_context()
-_ZN4HPHP20f_asio_enter_contextEv
-
-*/
-
 void fh_asio_enter_context() asm("_ZN4HPHP20f_asio_enter_contextEv");
 
-/*
-void HPHP::f_asio_exit_context()
-_ZN4HPHP19f_asio_exit_contextEv
-
-*/
-
 void fh_asio_exit_context() asm("_ZN4HPHP19f_asio_exit_contextEv");
 
-/*
-int HPHP::f_asio_get_current_context_idx()
-_ZN4HPHP30f_asio_get_current_context_idxEv
-
-(return value) => rax
-*/
-
 int fh_asio_get_current_context_idx() asm("_ZN4HPHP30f_asio_get_current_context_idxEv");
 
-/*
-HPHP::Object HPHP::f_asio_get_running_in_context(int)
-_ZN4HPHP29f_asio_get_running_in_contextEi
-
-(return value) => rax
-_rv => rdi
-ctx_idx => rsi
-*/
-
 Value* fh_asio_get_running_in_context(Value* _rv, int ctx_idx) asm("_ZN4HPHP29f_asio_get_running_in_contextEi");
 
-/*
-HPHP::Object HPHP::f_asio_get_running()
-_ZN4HPHP18f_asio_get_runningEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_asio_get_running(Value* _rv) asm("_ZN4HPHP18f_asio_get_runningEv");
 
-/*
-HPHP::Object HPHP::f_asio_get_current()
-_ZN4HPHP18f_asio_get_currentEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_asio_get_current(Value* _rv) asm("_ZN4HPHP18f_asio_get_currentEv");
 
-/*
-void HPHP::f_asio_set_on_failed_callback(HPHP::Variant const&)
-_ZN4HPHP29f_asio_set_on_failed_callbackERKNS_7VariantE
-
-on_failed_cb => rdi
-*/
-
 void fh_asio_set_on_failed_callback(TypedValue* on_failed_cb) asm("_ZN4HPHP29f_asio_set_on_failed_callbackERKNS_7VariantE");
 
-/*
-void HPHP::f_asio_set_on_started_callback(HPHP::Variant const&)
-_ZN4HPHP30f_asio_set_on_started_callbackERKNS_7VariantE
-
-on_started_cb => rdi
-*/
-
 void fh_asio_set_on_started_callback(TypedValue* on_started_cb) asm("_ZN4HPHP30f_asio_set_on_started_callbackERKNS_7VariantE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_bcmath.ext_hhvm.cpp

@@ -14,82 +14,54 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-bool HPHP::f_bcscale(long)
-_ZN4HPHP9f_bcscaleEl
-
-(return value) => rax
-scale => rdi
-*/
-
 bool fh_bcscale(long scale) asm("_ZN4HPHP9f_bcscaleEl");
 
-TypedValue * fg1_bcscale(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcscale(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcscale(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcscale(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   tvCastToInt64InPlace(args-0);
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_bcscale((long)(args[-0].m_data.num))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_bcscale(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfInt64) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_bcscale((long)(args[-0].m_data.num))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcscale(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcscale(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfInt64) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_bcscale((long)(args[-0].m_data.num))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("bcscale", count, 1, 1, 1);
+      fg1_bcscale(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcscale", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcadd(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcaddERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcadd(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcaddERKNS_6StringES2_l");
 
-TypedValue * fg1_bcadd(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcadd(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcadd(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcadd(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -104,59 +76,41 @@ TypedValue * fg1_bcadd(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcadd((&rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+  rv->m_type = KindOfString;
+  fh_bcadd(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcadd(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcadd((&rv.m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcadd(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcadd(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcadd(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcadd", count, 2, 3, 1);
+      fg1_bcadd(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcadd", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcsub(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcsubERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcsub(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcsubERKNS_6StringES2_l");
 
-TypedValue * fg1_bcsub(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcsub(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcsub(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcsub(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -171,58 +125,41 @@ TypedValue * fg1_bcsub(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcsub((&rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+  rv->m_type = KindOfString;
+  fh_bcsub(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcsub(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcsub((&rv.m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcsub(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcsub(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcsub(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcsub", count, 2, 3, 1);
+      fg1_bcsub(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcsub", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-long HPHP::f_bccomp(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP8f_bccompERKNS_6StringES2_l
-
-(return value) => rax
-left => rdi
-right => rsi
-scale => rdx
-*/
-
 long fh_bccomp(Value* left, Value* right, long scale) asm("_ZN4HPHP8f_bccompERKNS_6StringES2_l");
 
-TypedValue * fg1_bccomp(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bccomp(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bccomp(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bccomp(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfInt64;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -237,57 +174,39 @@ TypedValue * fg1_bccomp(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfInt64;
   rv->m_data.num = (int64_t)fh_bccomp(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-  return rv;
 }
 
-TypedValue* fg_bccomp(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfInt64;
-        rv.m_data.num = (int64_t)fh_bccomp(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bccomp(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bccomp(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfInt64;
+      rv->m_data.num = (int64_t)fh_bccomp(&args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
     } else {
-      throw_wrong_arguments_nr("bccomp", count, 2, 3, 1);
+      fg1_bccomp(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bccomp", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcmul(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcmulERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcmul(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcmulERKNS_6StringES2_l");
 
-TypedValue * fg1_bcmul(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcmul(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcmul(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcmul(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -302,59 +221,41 @@ TypedValue * fg1_bcmul(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcmul((&rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+  rv->m_type = KindOfString;
+  fh_bcmul(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcmul(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcmul((&rv.m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcmul(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcmul(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcmul(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcmul", count, 2, 3, 1);
+      fg1_bcmul(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcmul", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcdiv(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcdivERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcdiv(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcdivERKNS_6StringES2_l");
 
-TypedValue * fg1_bcdiv(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcdiv(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcdiv(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcdiv(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -369,117 +270,81 @@ TypedValue * fg1_bcdiv(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcdiv((&rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+  rv->m_type = KindOfString;
+  fh_bcdiv(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcdiv(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcdiv((&rv.m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcdiv(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcdiv(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcdiv(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcdiv", count, 2, 3, 1);
+      fg1_bcdiv(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcdiv", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcmod(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP7f_bcmodERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-*/
-
 Value* fh_bcmod(Value* _rv, Value* left, Value* right) asm("_ZN4HPHP7f_bcmodERKNS_6StringES2_");
 
-TypedValue * fg1_bcmod(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcmod(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcmod(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcmod(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   if (!IS_STRING_TYPE((args-1)->m_type)) {
     tvCastToStringInPlace(args-1);
   }
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcmod((&rv->m_data), &args[-0].m_data, &args[-1].m_data);
+  rv->m_type = KindOfString;
+  fh_bcmod(&(rv->m_data), &args[-0].m_data, &args[-1].m_data);
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcmod(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if (IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcmod((&rv.m_data), &args[-0].m_data, &args[-1].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcmod(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcmod(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if (IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcmod(&(rv->m_data), &args[-0].m_data, &args[-1].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcmod", count, 2, 2, 1);
+      fg1_bcmod(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcmod", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bcpow(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcpowERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcpow(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcpowERKNS_6StringES2_l");
 
-TypedValue * fg1_bcpow(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcpow(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcpow(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcpow(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -494,58 +359,40 @@ TypedValue * fg1_bcpow(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcpow((&rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+  rv->m_type = KindOfString;
+  fh_bcpow(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcpow(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_bcpow((&rv.m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcpow(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcpow(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_bcpow(&(rv->m_data), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (long)(args[-2].m_data.num) : (long)(-1));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcpow", count, 2, 3, 1);
+      fg1_bcpow(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcpow", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bcpowmod(HPHP::String const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP10f_bcpowmodERKNS_6StringES2_S2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-modulus => rcx
-scale => r8
-*/
-
 TypedValue* fh_bcpowmod(TypedValue* _rv, Value* left, Value* right, Value* modulus, long scale) asm("_ZN4HPHP10f_bcpowmodERKNS_6StringES2_S2_l");
 
-TypedValue * fg1_bcpowmod(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcpowmod(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcpowmod(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcpowmod(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 4
@@ -564,55 +411,39 @@ TypedValue * fg1_bcpowmod(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcpowmod((rv), &args[-0].m_data, &args[-1].m_data, &args[-2].m_data, (count > 3) ? (long)(args[-3].m_data.num) : (long)(-1));
+  fh_bcpowmod(rv, &args[-0].m_data, &args[-1].m_data, &args[-2].m_data, (count > 3) ? (long)(args[-3].m_data.num) : (long)(-1));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcpowmod(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 3LL && count <= 4LL) {
-      if ((count <= 3 || (args-3)->m_type == KindOfInt64) && IS_STRING_TYPE((args-2)->m_type) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_bcpowmod((&(rv)), &args[-0].m_data, &args[-1].m_data, &args[-2].m_data, (count > 3) ? (long)(args[-3].m_data.num) : (long)(-1));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcpowmod(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcpowmod(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 3 && count <= 4) {
+    if ((count <= 3 || (args - 3)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 2)->m_type) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_bcpowmod(rv, &args[-0].m_data, &args[-1].m_data, &args[-2].m_data, (count > 3) ? (long)(args[-3].m_data.num) : (long)(-1));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcpowmod", count, 3, 4, 1);
+      fg1_bcpowmod(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcpowmod", count, 3, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bcsqrt(HPHP::String const&, long)
-_ZN4HPHP8f_bcsqrtERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-operand => rsi
-scale => rdx
-*/
-
 TypedValue* fh_bcsqrt(TypedValue* _rv, Value* operand, long scale) asm("_ZN4HPHP8f_bcsqrtERKNS_6StringEl");
 
-TypedValue * fg1_bcsqrt(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bcsqrt(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bcsqrt(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bcsqrt(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 2
@@ -625,41 +456,31 @@ TypedValue * fg1_bcsqrt(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bcsqrt((rv), &args[-0].m_data, (count > 1) ? (long)(args[-1].m_data.num) : (long)(-1));
+  fh_bcsqrt(rv, &args[-0].m_data, (count > 1) ? (long)(args[-1].m_data.num) : (long)(-1));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bcsqrt(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_bcsqrt((&(rv)), &args[-0].m_data, (count > 1) ? (long)(args[-1].m_data.num) : (long)(-1));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bcsqrt(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bcsqrt(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_bcsqrt(rv, &args[-0].m_data, (count > 1) ? (long)(args[-1].m_data.num) : (long)(-1));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bcsqrt", count, 1, 2, 1);
+      fg1_bcsqrt(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bcsqrt", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_bcmath.ext_hhvm.h

@@ -16,131 +16,24 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_bcscale(long)
-_ZN4HPHP9f_bcscaleEl
-
-(return value) => rax
-scale => rdi
-*/
-
 bool fh_bcscale(long scale) asm("_ZN4HPHP9f_bcscaleEl");
 
-/*
-HPHP::String HPHP::f_bcadd(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcaddERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcadd(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcaddERKNS_6StringES2_l");
 
-/*
-HPHP::String HPHP::f_bcsub(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcsubERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcsub(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcsubERKNS_6StringES2_l");
 
-/*
-long HPHP::f_bccomp(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP8f_bccompERKNS_6StringES2_l
-
-(return value) => rax
-left => rdi
-right => rsi
-scale => rdx
-*/
-
 long fh_bccomp(Value* left, Value* right, long scale) asm("_ZN4HPHP8f_bccompERKNS_6StringES2_l");
 
-/*
-HPHP::String HPHP::f_bcmul(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcmulERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcmul(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcmulERKNS_6StringES2_l");
 
-/*
-HPHP::String HPHP::f_bcdiv(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcdivERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcdiv(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcdivERKNS_6StringES2_l");
 
-/*
-HPHP::String HPHP::f_bcmod(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP7f_bcmodERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-*/
-
 Value* fh_bcmod(Value* _rv, Value* left, Value* right) asm("_ZN4HPHP7f_bcmodERKNS_6StringES2_");
 
-/*
-HPHP::String HPHP::f_bcpow(HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP7f_bcpowERKNS_6StringES2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-scale => rcx
-*/
-
 Value* fh_bcpow(Value* _rv, Value* left, Value* right, long scale) asm("_ZN4HPHP7f_bcpowERKNS_6StringES2_l");
 
-/*
-HPHP::Variant HPHP::f_bcpowmod(HPHP::String const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP10f_bcpowmodERKNS_6StringES2_S2_l
-
-(return value) => rax
-_rv => rdi
-left => rsi
-right => rdx
-modulus => rcx
-scale => r8
-*/
-
 TypedValue* fh_bcpowmod(TypedValue* _rv, Value* left, Value* right, Value* modulus, long scale) asm("_ZN4HPHP10f_bcpowmodERKNS_6StringES2_S2_l");
 
-/*
-HPHP::Variant HPHP::f_bcsqrt(HPHP::String const&, long)
-_ZN4HPHP8f_bcsqrtERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-operand => rsi
-scale => rdx
-*/
-
 TypedValue* fh_bcsqrt(TypedValue* _rv, Value* operand, long scale) asm("_ZN4HPHP8f_bcsqrtERKNS_6StringEl");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_bzip2.ext_hhvm.cpp

@@ -14,131 +14,53 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_bzclose(HPHP::Object const&)
-_ZN4HPHP9f_bzcloseERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 TypedValue* fh_bzclose(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzcloseERKNS_6ObjectE");
 
-TypedValue * fg1_bzclose(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzclose(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzclose(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzclose(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   tvCastToObjectInPlace(args-0);
-  fh_bzclose((rv), &args[-0].m_data);
+  fh_bzclose(rv, &args[-0].m_data);
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzclose(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        fh_bzclose((&(rv)), &args[-0].m_data);
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzclose(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
-    } else {
-      throw_wrong_arguments_nr("bzclose", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-/*
-HPHP::Variant HPHP::f_bzopen(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-filename => rsi
-mode => rdx
-*/
-
-TypedValue* fh_bzopen(TypedValue* _rv, TypedValue* filename, Value* mode) asm("_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE");
-
-TypedValue * fg1_bzopen(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzopen(TypedValue* rv, ActRec* ar, int64_t count) {
+TypedValue* fg_bzclose(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  tvCastToStringInPlace(args-1);
-  fh_bzopen((rv), (args-0), &args[-1].m_data);
-  if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
-}
-
-TypedValue* fg_bzopen(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if (IS_STRING_TYPE((args-1)->m_type)) {
-        fh_bzopen((&(rv)), (args-0), &args[-1].m_data);
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzopen(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      fh_bzclose(rv, &args[-0].m_data);
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzopen", count, 2, 2, 1);
+      fg1_bzclose(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzclose", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bzread(HPHP::Object const&, int)
-_ZN4HPHP8f_bzreadERKNS_6ObjectEi
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-length => rdx
-*/
-
 TypedValue* fh_bzread(TypedValue* _rv, Value* bz, int length) asm("_ZN4HPHP8f_bzreadERKNS_6ObjectEi");
 
-TypedValue * fg1_bzread(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzread(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzread(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzread(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 2
@@ -151,56 +73,37 @@ TypedValue * fg1_bzread(TypedValue* rv, ActRec* ar, int64_t count) {
   if ((args-0)->m_type != KindOfObject) {
     tvCastToObjectInPlace(args-0);
   }
-  fh_bzread((rv), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(1024));
+  fh_bzread(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(1024));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzread(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64) && (args-0)->m_type == KindOfObject) {
-        fh_bzread((&(rv)), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(1024));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzread(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzread(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        (args - 0)->m_type == KindOfObject) {
+      fh_bzread(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(1024));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzread", count, 1, 2, 1);
+      fg1_bzread(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzread", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bzwrite(HPHP::Object const&, HPHP::String const&, int)
-_ZN4HPHP9f_bzwriteERKNS_6ObjectERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-data => rdx
-length => rcx
-*/
-
 TypedValue* fh_bzwrite(TypedValue* _rv, Value* bz, Value* data, int length) asm("_ZN4HPHP9f_bzwriteERKNS_6ObjectERKNS_6StringEi");
 
-TypedValue * fg1_bzwrite(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzwrite(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzwrite(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzwrite(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -216,257 +119,200 @@ TypedValue * fg1_bzwrite(TypedValue* rv, ActRec* ar, int64_t count) {
   if ((args-0)->m_type != KindOfObject) {
     tvCastToObjectInPlace(args-0);
   }
-  fh_bzwrite((rv), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
+  fh_bzwrite(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzwrite(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && (args-0)->m_type == KindOfObject) {
-        fh_bzwrite((&(rv)), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzwrite(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzwrite(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        (args - 0)->m_type == KindOfObject) {
+      fh_bzwrite(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzwrite", count, 2, 3, 1);
+      fg1_bzwrite(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzwrite", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+TypedValue* fh_bzopen(TypedValue* _rv, TypedValue* filename, Value* mode) asm("_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE");
 
+void fg1_bzopen(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzopen(TypedValue* rv, ActRec* ar, int32_t count) {
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  tvCastToStringInPlace(args-1);
+  fh_bzopen(rv, (args-0), &args[-1].m_data);
+  if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+}
 
-/*
-HPHP::Variant HPHP::f_bzflush(HPHP::Object const&)
-_ZN4HPHP9f_bzflushERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
+TypedValue* fg_bzopen(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if (IS_STRING_TYPE((args - 1)->m_type)) {
+      fh_bzopen(rv, (args-0), &args[-1].m_data);
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+    } else {
+      fg1_bzopen(rv, ar, count);
+    }
+  } else {
+    throw_wrong_arguments_nr("bzopen", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
 
 TypedValue* fh_bzflush(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzflushERKNS_6ObjectE");
 
-TypedValue * fg1_bzflush(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzflush(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzflush(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzflush(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   tvCastToObjectInPlace(args-0);
-  fh_bzflush((rv), &args[-0].m_data);
+  fh_bzflush(rv, &args[-0].m_data);
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzflush(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        fh_bzflush((&(rv)), &args[-0].m_data);
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzflush(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzflush(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      fh_bzflush(rv, &args[-0].m_data);
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzflush", count, 1, 1, 1);
+      fg1_bzflush(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzflush", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_bzerrstr(HPHP::Object const&)
-_ZN4HPHP10f_bzerrstrERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 Value* fh_bzerrstr(Value* _rv, Value* bz) asm("_ZN4HPHP10f_bzerrstrERKNS_6ObjectE");
 
-TypedValue * fg1_bzerrstr(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzerrstr(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzerrstr(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzerrstr(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   tvCastToObjectInPlace(args-0);
-  fh_bzerrstr((&rv->m_data), &args[-0].m_data);
+  rv->m_type = KindOfString;
+  fh_bzerrstr(&(rv->m_data), &args[-0].m_data);
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzerrstr(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        rv.m_type = KindOfString;
-        fh_bzerrstr((&rv.m_data), &args[-0].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzerrstr(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzerrstr(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      rv->m_type = KindOfString;
+      fh_bzerrstr(&(rv->m_data), &args[-0].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzerrstr", count, 1, 1, 1);
+      fg1_bzerrstr(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzerrstr", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bzerror(HPHP::Object const&)
-_ZN4HPHP9f_bzerrorERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 TypedValue* fh_bzerror(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzerrorERKNS_6ObjectE");
 
-TypedValue * fg1_bzerror(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzerror(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzerror(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzerror(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   tvCastToObjectInPlace(args-0);
-  fh_bzerror((rv), &args[-0].m_data);
+  fh_bzerror(rv, &args[-0].m_data);
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzerror(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        fh_bzerror((&(rv)), &args[-0].m_data);
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzerror(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzerror(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      fh_bzerror(rv, &args[-0].m_data);
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzerror", count, 1, 1, 1);
+      fg1_bzerror(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzerror", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-long HPHP::f_bzerrno(HPHP::Object const&)
-_ZN4HPHP9f_bzerrnoERKNS_6ObjectE
-
-(return value) => rax
-bz => rdi
-*/
-
 long fh_bzerrno(Value* bz) asm("_ZN4HPHP9f_bzerrnoERKNS_6ObjectE");
 
-TypedValue * fg1_bzerrno(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzerrno(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzerrno(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzerrno(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfInt64;
   tvCastToObjectInPlace(args-0);
+  rv->m_type = KindOfInt64;
   rv->m_data.num = (int64_t)fh_bzerrno(&args[-0].m_data);
-  return rv;
 }
 
-TypedValue* fg_bzerrno(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if ((args-0)->m_type == KindOfObject) {
-        rv.m_type = KindOfInt64;
-        rv.m_data.num = (int64_t)fh_bzerrno(&args[-0].m_data);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzerrno(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzerrno(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if ((args - 0)->m_type == KindOfObject) {
+      rv->m_type = KindOfInt64;
+      rv->m_data.num = (int64_t)fh_bzerrno(&args[-0].m_data);
     } else {
-      throw_wrong_arguments_nr("bzerrno", count, 1, 1, 1);
+      fg1_bzerrno(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzerrno", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bzcompress(HPHP::String const&, int, int)
-_ZN4HPHP12f_bzcompressERKNS_6StringEii
-
-(return value) => rax
-_rv => rdi
-source => rsi
-blocksize => rdx
-workfactor => rcx
-*/
-
 TypedValue* fh_bzcompress(TypedValue* _rv, Value* source, int blocksize, int workfactor) asm("_ZN4HPHP12f_bzcompressERKNS_6StringEii");
 
-TypedValue * fg1_bzcompress(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzcompress(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzcompress(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzcompress(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -483,55 +329,38 @@ TypedValue * fg1_bzcompress(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bzcompress((rv), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(4), (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
+  fh_bzcompress(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(4), (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzcompress(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 3LL) {
-      if ((count <= 2 || (args-2)->m_type == KindOfInt64) && (count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_bzcompress((&(rv)), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(4), (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzcompress(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzcompress(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 3) {
+    if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        (count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_bzcompress(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(4), (count > 2) ? (int)(args[-2].m_data.num) : (int)(0));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzcompress", count, 1, 3, 1);
+      fg1_bzcompress(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzcompress", count, 1, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_bzdecompress(HPHP::String const&, int)
-_ZN4HPHP14f_bzdecompressERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-source => rsi
-small => rdx
-*/
-
 TypedValue* fh_bzdecompress(TypedValue* _rv, Value* source, int small) asm("_ZN4HPHP14f_bzdecompressERKNS_6StringEi");
 
-TypedValue * fg1_bzdecompress(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_bzdecompress(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_bzdecompress(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_bzdecompress(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 2
@@ -544,41 +373,31 @@ TypedValue * fg1_bzdecompress(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_bzdecompress((rv), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0));
+  fh_bzdecompress(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_bzdecompress(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_bzdecompress((&(rv)), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_bzdecompress(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_bzdecompress(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_bzdecompress(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("bzdecompress", count, 1, 2, 1);
+      fg1_bzdecompress(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("bzdecompress", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_bzip2.ext_hhvm.h

@@ -16,122 +16,24 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_bzclose(HPHP::Object const&)
-_ZN4HPHP9f_bzcloseERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 TypedValue* fh_bzclose(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzcloseERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_bzopen(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-filename => rsi
-mode => rdx
-*/
-
-TypedValue* fh_bzopen(TypedValue* _rv, TypedValue* filename, Value* mode) asm("_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE");
-
-/*
-HPHP::Variant HPHP::f_bzread(HPHP::Object const&, int)
-_ZN4HPHP8f_bzreadERKNS_6ObjectEi
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-length => rdx
-*/
-
 TypedValue* fh_bzread(TypedValue* _rv, Value* bz, int length) asm("_ZN4HPHP8f_bzreadERKNS_6ObjectEi");
 
-/*
-HPHP::Variant HPHP::f_bzwrite(HPHP::Object const&, HPHP::String const&, int)
-_ZN4HPHP9f_bzwriteERKNS_6ObjectERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-data => rdx
-length => rcx
-*/
-
 TypedValue* fh_bzwrite(TypedValue* _rv, Value* bz, Value* data, int length) asm("_ZN4HPHP9f_bzwriteERKNS_6ObjectERKNS_6StringEi");
 
-/*
-HPHP::Variant HPHP::f_bzflush(HPHP::Object const&)
-_ZN4HPHP9f_bzflushERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
+TypedValue* fh_bzopen(TypedValue* _rv, TypedValue* filename, Value* mode) asm("_ZN4HPHP8f_bzopenERKNS_7VariantERKNS_6StringE");
 
 TypedValue* fh_bzflush(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzflushERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_bzerrstr(HPHP::Object const&)
-_ZN4HPHP10f_bzerrstrERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 Value* fh_bzerrstr(Value* _rv, Value* bz) asm("_ZN4HPHP10f_bzerrstrERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_bzerror(HPHP::Object const&)
-_ZN4HPHP9f_bzerrorERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-bz => rsi
-*/
-
 TypedValue* fh_bzerror(TypedValue* _rv, Value* bz) asm("_ZN4HPHP9f_bzerrorERKNS_6ObjectE");
 
-/*
-long HPHP::f_bzerrno(HPHP::Object const&)
-_ZN4HPHP9f_bzerrnoERKNS_6ObjectE
-
-(return value) => rax
-bz => rdi
-*/
-
 long fh_bzerrno(Value* bz) asm("_ZN4HPHP9f_bzerrnoERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_bzcompress(HPHP::String const&, int, int)
-_ZN4HPHP12f_bzcompressERKNS_6StringEii
-
-(return value) => rax
-_rv => rdi
-source => rsi
-blocksize => rdx
-workfactor => rcx
-*/
-
 TypedValue* fh_bzcompress(TypedValue* _rv, Value* source, int blocksize, int workfactor) asm("_ZN4HPHP12f_bzcompressERKNS_6StringEii");
 
-/*
-HPHP::Variant HPHP::f_bzdecompress(HPHP::String const&, int)
-_ZN4HPHP14f_bzdecompressERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-source => rsi
-small => rdx
-*/
-
 TypedValue* fh_bzdecompress(TypedValue* _rv, Value* source, int small) asm("_ZN4HPHP14f_bzdecompressERKNS_6StringEi");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_class.ext_hhvm.h

@@ -16,209 +16,40 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Array HPHP::f_get_declared_classes()
-_ZN4HPHP22f_get_declared_classesEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_get_declared_classes(Value* _rv) asm("_ZN4HPHP22f_get_declared_classesEv");
 
-/*
-HPHP::Array HPHP::f_get_declared_interfaces()
-_ZN4HPHP25f_get_declared_interfacesEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_get_declared_interfaces(Value* _rv) asm("_ZN4HPHP25f_get_declared_interfacesEv");
 
-/*
-HPHP::Array HPHP::f_get_declared_traits()
-_ZN4HPHP21f_get_declared_traitsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_get_declared_traits(Value* _rv) asm("_ZN4HPHP21f_get_declared_traitsEv");
 
-/*
-bool HPHP::f_class_exists(HPHP::String const&, bool)
-_ZN4HPHP14f_class_existsERKNS_6StringEb
-
-(return value) => rax
-class_name => rdi
-autoload => rsi
-*/
-
 bool fh_class_exists(Value* class_name, bool autoload) asm("_ZN4HPHP14f_class_existsERKNS_6StringEb");
 
-/*
-bool HPHP::f_interface_exists(HPHP::String const&, bool)
-_ZN4HPHP18f_interface_existsERKNS_6StringEb
-
-(return value) => rax
-interface_name => rdi
-autoload => rsi
-*/
-
 bool fh_interface_exists(Value* interface_name, bool autoload) asm("_ZN4HPHP18f_interface_existsERKNS_6StringEb");
 
-/*
-bool HPHP::f_trait_exists(HPHP::String const&, bool)
-_ZN4HPHP14f_trait_existsERKNS_6StringEb
-
-(return value) => rax
-trait_name => rdi
-autoload => rsi
-*/
-
 bool fh_trait_exists(Value* trait_name, bool autoload) asm("_ZN4HPHP14f_trait_existsERKNS_6StringEb");
 
-/*
-HPHP::Array HPHP::f_get_class_methods(HPHP::Variant const&)
-_ZN4HPHP19f_get_class_methodsERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-class_or_object => rsi
-*/
-
 Value* fh_get_class_methods(Value* _rv, TypedValue* class_or_object) asm("_ZN4HPHP19f_get_class_methodsERKNS_7VariantE");
 
-/*
-HPHP::Array HPHP::f_get_class_vars(HPHP::String const&)
-_ZN4HPHP16f_get_class_varsERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-class_name => rsi
-*/
-
-Value* fh_get_class_vars(Value* _rv, Value* class_name) asm("_ZN4HPHP16f_get_class_varsERKNS_6StringE");
-
-/*
-HPHP::Array HPHP::f_get_class_constants(HPHP::String const&)
-_ZN4HPHP21f_get_class_constantsERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-class_name => rsi
-*/
-
 Value* fh_get_class_constants(Value* _rv, Value* class_name) asm("_ZN4HPHP21f_get_class_constantsERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_get_class(HPHP::Variant const&)
-_ZN4HPHP11f_get_classERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
+Value* fh_get_class_vars(Value* _rv, Value* class_name) asm("_ZN4HPHP16f_get_class_varsERKNS_6StringE");
 
 TypedValue* fh_get_class(TypedValue* _rv, TypedValue* object) asm("_ZN4HPHP11f_get_classERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_get_parent_class(HPHP::Variant const&)
-_ZN4HPHP18f_get_parent_classERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
-
 TypedValue* fh_get_parent_class(TypedValue* _rv, TypedValue* object) asm("_ZN4HPHP18f_get_parent_classERKNS_7VariantE");
 
-/*
-bool HPHP::f_is_a(HPHP::Variant const&, HPHP::String const&, bool)
-_ZN4HPHP6f_is_aERKNS_7VariantERKNS_6StringEb
-
-(return value) => rax
-class_or_object => rdi
-class_name => rsi
-allow_string => rdx
-*/
-
 bool fh_is_a(TypedValue* class_or_object, Value* class_name, bool allow_string) asm("_ZN4HPHP6f_is_aERKNS_7VariantERKNS_6StringEb");
 
-/*
-bool HPHP::f_is_subclass_of(HPHP::Variant const&, HPHP::String const&, bool)
-_ZN4HPHP16f_is_subclass_ofERKNS_7VariantERKNS_6StringEb
-
-(return value) => rax
-class_or_object => rdi
-class_name => rsi
-allow_string => rdx
-*/
-
 bool fh_is_subclass_of(TypedValue* class_or_object, Value* class_name, bool allow_string) asm("_ZN4HPHP16f_is_subclass_ofERKNS_7VariantERKNS_6StringEb");
 
-/*
-bool HPHP::f_method_exists(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP15f_method_existsERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-class_or_object => rdi
-method_name => rsi
-*/
-
 bool fh_method_exists(TypedValue* class_or_object, Value* method_name) asm("_ZN4HPHP15f_method_existsERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_property_exists(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP17f_property_existsERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-class_or_object => rsi
-property => rdx
-*/
-
 TypedValue* fh_property_exists(TypedValue* _rv, TypedValue* class_or_object, Value* property) asm("_ZN4HPHP17f_property_existsERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_get_object_vars(HPHP::Variant const&)
-_ZN4HPHP17f_get_object_varsERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
-
 TypedValue* fh_get_object_vars(TypedValue* _rv, TypedValue* object) asm("_ZN4HPHP17f_get_object_varsERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_call_user_method_array(HPHP::String const&, HPHP::VRefParamValue const&, HPHP::Array const&)
-_ZN4HPHP24f_call_user_method_arrayERKNS_6StringERKNS_14VRefParamValueERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-method_name => rsi
-obj => rdx
-paramarr => rcx
-*/
-
 TypedValue* fh_call_user_method_array(TypedValue* _rv, Value* method_name, TypedValue* obj, Value* paramarr) asm("_ZN4HPHP24f_call_user_method_arrayERKNS_6StringERKNS_14VRefParamValueERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_call_user_method(int, HPHP::String const&, HPHP::VRefParamValue const&, HPHP::Array const&)
-_ZN4HPHP18f_call_user_methodEiRKNS_6StringERKNS_14VRefParamValueERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-method_name => rdx
-obj => rcx
-_argv => r8
-*/
-
 TypedValue* fh_call_user_method(TypedValue* _rv, int64_t _argc, Value* method_name, TypedValue* obj, Value* _argv) asm("_ZN4HPHP18f_call_user_methodEiRKNS_6StringERKNS_14VRefParamValueERKNS_5ArrayE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_closure.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_Closure_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_Closure) - sizeof(ObjectData);
@@ -34,42 +36,32 @@ HPHP::VM::Instance* new_Closure_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(Closure);
-/*
-void HPHP::c_Closure::t___construct()
-_ZN4HPHP9c_Closure13t___constructEv
-
-this_ => rdi
-*/
-
 void th_7Closure___construct(ObjectData* this_) asm("_ZN4HPHP9c_Closure13t___constructEv");
 
-TypedValue* tg_7Closure___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_7Closure___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("Closure::__construct", 0, 1);
-      }
+TypedValue* tg_7Closure___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_7Closure___construct((this_));
     } else {
-      throw_instance_method_fatal("Closure::__construct");
+      throw_toomany_arguments_nr("Closure::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("Closure::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+
 HPHP::VM::Instance* new_DummyClosure_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_DummyClosure) - sizeof(ObjectData);
@@ -80,42 +72,29 @@ HPHP::VM::Instance* new_DummyClosure_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(DummyClosure);
-/*
-void HPHP::c_DummyClosure::t___construct()
-_ZN4HPHP14c_DummyClosure13t___constructEv
-
-this_ => rdi
-*/
-
 void th_12DummyClosure___construct(ObjectData* this_) asm("_ZN4HPHP14c_DummyClosure13t___constructEv");
 
-TypedValue* tg_12DummyClosure___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_12DummyClosure___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("DummyClosure::__construct", 0, 1);
-      }
+TypedValue* tg_12DummyClosure___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_12DummyClosure___construct((this_));
     } else {
-      throw_instance_method_fatal("DummyClosure::__construct");
+      throw_toomany_arguments_nr("DummyClosure::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("DummyClosure::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_closure.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_collections.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_continuation.ext_hhvm.h

@@ -16,20 +16,6 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Object HPHP::f_hphp_create_continuation(HPHP::String const&, HPHP::String const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP26f_hphp_create_continuationERKNS_6StringES2_S2_RKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-clsname => rsi
-funcname => rdx
-origFuncName => rcx
-args => r8
-*/
-
 Value* fh_hphp_create_continuation(Value* _rv, Value* clsname, Value* funcname, Value* origFuncName, Value* args) asm("_ZN4HPHP26f_hphp_create_continuationERKNS_6StringES2_S2_RKNS_5ArrayE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_ctype.ext_hhvm.cpp

@@ -14,379 +14,235 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-bool HPHP::f_ctype_alnum(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_alnumERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_alnum(TypedValue* text) asm("_ZN4HPHP13f_ctype_alnumERKNS_7VariantE");
 
-TypedValue* fg_ctype_alnum(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_alnum((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_alnum", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_alnum(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_alnum((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_alnum", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_alpha(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_alphaERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_alpha(TypedValue* text) asm("_ZN4HPHP13f_ctype_alphaERKNS_7VariantE");
 
-TypedValue* fg_ctype_alpha(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_alpha((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_alpha", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_alpha(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_alpha((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_alpha", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_cntrl(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_cntrlERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_cntrl(TypedValue* text) asm("_ZN4HPHP13f_ctype_cntrlERKNS_7VariantE");
 
-TypedValue* fg_ctype_cntrl(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_cntrl((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_cntrl", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_cntrl(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_cntrl((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_cntrl", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_digit(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_digitERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_digit(TypedValue* text) asm("_ZN4HPHP13f_ctype_digitERKNS_7VariantE");
 
-TypedValue* fg_ctype_digit(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_digit((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_digit", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_digit(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_digit((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_digit", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_graph(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_graphERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_graph(TypedValue* text) asm("_ZN4HPHP13f_ctype_graphERKNS_7VariantE");
 
-TypedValue* fg_ctype_graph(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_graph((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_graph", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_graph(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_graph((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_graph", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_lower(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_lowerERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_lower(TypedValue* text) asm("_ZN4HPHP13f_ctype_lowerERKNS_7VariantE");
 
-TypedValue* fg_ctype_lower(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_lower((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_lower", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_lower(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_lower((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_lower", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_print(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_printERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_print(TypedValue* text) asm("_ZN4HPHP13f_ctype_printERKNS_7VariantE");
 
-TypedValue* fg_ctype_print(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_print((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_print", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_print(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_print((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_print", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_punct(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_punctERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_punct(TypedValue* text) asm("_ZN4HPHP13f_ctype_punctERKNS_7VariantE");
 
-TypedValue* fg_ctype_punct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_punct((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_punct", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_punct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_punct((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_punct", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_space(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_spaceERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_space(TypedValue* text) asm("_ZN4HPHP13f_ctype_spaceERKNS_7VariantE");
 
-TypedValue* fg_ctype_space(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_space((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_space", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_space(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_space((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_space", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_upper(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_upperERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_upper(TypedValue* text) asm("_ZN4HPHP13f_ctype_upperERKNS_7VariantE");
 
-TypedValue* fg_ctype_upper(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_upper((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_upper", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_upper(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_upper((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_upper", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_ctype_xdigit(HPHP::Variant const&)
-_ZN4HPHP14f_ctype_xdigitERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_xdigit(TypedValue* text) asm("_ZN4HPHP14f_ctype_xdigitERKNS_7VariantE");
 
-TypedValue* fg_ctype_xdigit(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_ctype_xdigit((args-0))) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("ctype_xdigit", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_ctype_xdigit(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_ctype_xdigit((args-0))) ? 1LL : 0LL;
+  } else {
+    throw_wrong_arguments_nr("ctype_xdigit", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_ctype.ext_hhvm.h

@@ -16,116 +16,26 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_ctype_alnum(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_alnumERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_alnum(TypedValue* text) asm("_ZN4HPHP13f_ctype_alnumERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_alpha(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_alphaERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_alpha(TypedValue* text) asm("_ZN4HPHP13f_ctype_alphaERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_cntrl(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_cntrlERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_cntrl(TypedValue* text) asm("_ZN4HPHP13f_ctype_cntrlERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_digit(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_digitERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_digit(TypedValue* text) asm("_ZN4HPHP13f_ctype_digitERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_graph(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_graphERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_graph(TypedValue* text) asm("_ZN4HPHP13f_ctype_graphERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_lower(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_lowerERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_lower(TypedValue* text) asm("_ZN4HPHP13f_ctype_lowerERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_print(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_printERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_print(TypedValue* text) asm("_ZN4HPHP13f_ctype_printERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_punct(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_punctERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_punct(TypedValue* text) asm("_ZN4HPHP13f_ctype_punctERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_space(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_spaceERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_space(TypedValue* text) asm("_ZN4HPHP13f_ctype_spaceERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_upper(HPHP::Variant const&)
-_ZN4HPHP13f_ctype_upperERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_upper(TypedValue* text) asm("_ZN4HPHP13f_ctype_upperERKNS_7VariantE");
 
-/*
-bool HPHP::f_ctype_xdigit(HPHP::Variant const&)
-_ZN4HPHP14f_ctype_xdigitERKNS_7VariantE
-
-(return value) => rax
-text => rdi
-*/
-
 bool fh_ctype_xdigit(TypedValue* text) asm("_ZN4HPHP14f_ctype_xdigitERKNS_7VariantE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_curl.ext_hhvm.h

@@ -16,313 +16,56 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_curl_init(HPHP::String const&)
-_ZN4HPHP11f_curl_initERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-url => rsi
-*/
-
 TypedValue* fh_curl_init(TypedValue* _rv, Value* url) asm("_ZN4HPHP11f_curl_initERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_curl_copy_handle(HPHP::Object const&)
-_ZN4HPHP18f_curl_copy_handleERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
 TypedValue* fh_curl_copy_handle(TypedValue* _rv, Value* ch) asm("_ZN4HPHP18f_curl_copy_handleERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_curl_version(int)
-_ZN4HPHP14f_curl_versionEi
-
-(return value) => rax
-_rv => rdi
-uversion => rsi
-*/
-
 TypedValue* fh_curl_version(TypedValue* _rv, int uversion) asm("_ZN4HPHP14f_curl_versionEi");
 
-/*
-bool HPHP::f_curl_setopt(HPHP::Object const&, int, HPHP::Variant const&)
-_ZN4HPHP13f_curl_setoptERKNS_6ObjectEiRKNS_7VariantE
-
-(return value) => rax
-ch => rdi
-option => rsi
-value => rdx
-*/
-
 bool fh_curl_setopt(Value* ch, int option, TypedValue* value) asm("_ZN4HPHP13f_curl_setoptERKNS_6ObjectEiRKNS_7VariantE");
 
-/*
-bool HPHP::f_curl_setopt_array(HPHP::Object const&, HPHP::Array const&)
-_ZN4HPHP19f_curl_setopt_arrayERKNS_6ObjectERKNS_5ArrayE
-
-(return value) => rax
-ch => rdi
-options => rsi
-*/
-
 bool fh_curl_setopt_array(Value* ch, Value* options) asm("_ZN4HPHP19f_curl_setopt_arrayERKNS_6ObjectERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_fb_curl_getopt(HPHP::Object const&, int)
-_ZN4HPHP16f_fb_curl_getoptERKNS_6ObjectEi
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-opt => rdx
-*/
-
 TypedValue* fh_fb_curl_getopt(TypedValue* _rv, Value* ch, int opt) asm("_ZN4HPHP16f_fb_curl_getoptERKNS_6ObjectEi");
 
-/*
-HPHP::Variant HPHP::f_curl_exec(HPHP::Object const&)
-_ZN4HPHP11f_curl_execERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
 TypedValue* fh_curl_exec(TypedValue* _rv, Value* ch) asm("_ZN4HPHP11f_curl_execERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_curl_getinfo(HPHP::Object const&, int)
-_ZN4HPHP14f_curl_getinfoERKNS_6ObjectEi
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-opt => rdx
-*/
-
 TypedValue* fh_curl_getinfo(TypedValue* _rv, Value* ch, int opt) asm("_ZN4HPHP14f_curl_getinfoERKNS_6ObjectEi");
 
-/*
-HPHP::Variant HPHP::f_curl_errno(HPHP::Object const&)
-_ZN4HPHP12f_curl_errnoERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
 TypedValue* fh_curl_errno(TypedValue* _rv, Value* ch) asm("_ZN4HPHP12f_curl_errnoERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_curl_error(HPHP::Object const&)
-_ZN4HPHP12f_curl_errorERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
 TypedValue* fh_curl_error(TypedValue* _rv, Value* ch) asm("_ZN4HPHP12f_curl_errorERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_curl_close(HPHP::Object const&)
-_ZN4HPHP12f_curl_closeERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
 TypedValue* fh_curl_close(TypedValue* _rv, Value* ch) asm("_ZN4HPHP12f_curl_closeERKNS_6ObjectE");
 
-/*
-HPHP::Object HPHP::f_curl_multi_init()
-_ZN4HPHP17f_curl_multi_initEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_curl_multi_init(Value* _rv) asm("_ZN4HPHP17f_curl_multi_initEv");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_add_handle(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP23f_curl_multi_add_handleERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-ch => rdx
-*/
-
 TypedValue* fh_curl_multi_add_handle(TypedValue* _rv, Value* mh, Value* ch) asm("_ZN4HPHP23f_curl_multi_add_handleERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_remove_handle(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP26f_curl_multi_remove_handleERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-ch => rdx
-*/
-
 TypedValue* fh_curl_multi_remove_handle(TypedValue* _rv, Value* mh, Value* ch) asm("_ZN4HPHP26f_curl_multi_remove_handleERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_exec(HPHP::Object const&, HPHP::VRefParamValue const&)
-_ZN4HPHP17f_curl_multi_execERKNS_6ObjectERKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-still_running => rdx
-*/
-
 TypedValue* fh_curl_multi_exec(TypedValue* _rv, Value* mh, TypedValue* still_running) asm("_ZN4HPHP17f_curl_multi_execERKNS_6ObjectERKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_select(HPHP::Object const&, double)
-_ZN4HPHP19f_curl_multi_selectERKNS_6ObjectEd
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-timeout => xmm0
-*/
-
 TypedValue* fh_curl_multi_select(TypedValue* _rv, Value* mh, double timeout) asm("_ZN4HPHP19f_curl_multi_selectERKNS_6ObjectEd");
 
-/*
-HPHP::Variant HPHP::f_fb_curl_multi_fdset(HPHP::Object const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&)
-_ZN4HPHP21f_fb_curl_multi_fdsetERKNS_6ObjectERKNS_14VRefParamValueES5_S5_S5_
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-read_fd_set => rdx
-write_fd_set => rcx
-exc_fd_set => r8
-max_fd => r9
-*/
+TypedValue* fh_curl_multi_getcontent(TypedValue* _rv, Value* ch) asm("_ZN4HPHP23f_curl_multi_getcontentERKNS_6ObjectE");
 
 TypedValue* fh_fb_curl_multi_fdset(TypedValue* _rv, Value* mh, TypedValue* read_fd_set, TypedValue* write_fd_set, TypedValue* exc_fd_set, TypedValue* max_fd) asm("_ZN4HPHP21f_fb_curl_multi_fdsetERKNS_6ObjectERKNS_14VRefParamValueES5_S5_S5_");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_getcontent(HPHP::Object const&)
-_ZN4HPHP23f_curl_multi_getcontentERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-ch => rsi
-*/
-
-TypedValue* fh_curl_multi_getcontent(TypedValue* _rv, Value* ch) asm("_ZN4HPHP23f_curl_multi_getcontentERKNS_6ObjectE");
-
-/*
-HPHP::Variant HPHP::f_curl_multi_info_read(HPHP::Object const&, HPHP::VRefParamValue const&)
-_ZN4HPHP22f_curl_multi_info_readERKNS_6ObjectERKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-msgs_in_queue => rdx
-*/
-
 TypedValue* fh_curl_multi_info_read(TypedValue* _rv, Value* mh, TypedValue* msgs_in_queue) asm("_ZN4HPHP22f_curl_multi_info_readERKNS_6ObjectERKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_curl_multi_close(HPHP::Object const&)
-_ZN4HPHP18f_curl_multi_closeERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-mh => rsi
-*/
-
 TypedValue* fh_curl_multi_close(TypedValue* _rv, Value* mh) asm("_ZN4HPHP18f_curl_multi_closeERKNS_6ObjectE");
 
-/*
-void HPHP::f_evhttp_set_cache(HPHP::String const&, int, int)
-_ZN4HPHP18f_evhttp_set_cacheERKNS_6StringEii
-
-address => rdi
-max_conn => rsi
-port => rdx
-*/
-
 void fh_evhttp_set_cache(Value* address, int max_conn, int port) asm("_ZN4HPHP18f_evhttp_set_cacheERKNS_6StringEii");
 
-/*
-HPHP::Variant HPHP::f_evhttp_get(HPHP::String const&, HPHP::Array const&, int)
-_ZN4HPHP12f_evhttp_getERKNS_6StringERKNS_5ArrayEi
-
-(return value) => rax
-_rv => rdi
-url => rsi
-headers => rdx
-timeout => rcx
-*/
-
 TypedValue* fh_evhttp_get(TypedValue* _rv, Value* url, Value* headers, int timeout) asm("_ZN4HPHP12f_evhttp_getERKNS_6StringERKNS_5ArrayEi");
 
-/*
-HPHP::Variant HPHP::f_evhttp_post(HPHP::String const&, HPHP::String const&, HPHP::Array const&, int)
-_ZN4HPHP13f_evhttp_postERKNS_6StringES2_RKNS_5ArrayEi
-
-(return value) => rax
-_rv => rdi
-url => rsi
-data => rdx
-headers => rcx
-timeout => r8
-*/
-
 TypedValue* fh_evhttp_post(TypedValue* _rv, Value* url, Value* data, Value* headers, int timeout) asm("_ZN4HPHP13f_evhttp_postERKNS_6StringES2_RKNS_5ArrayEi");
 
-/*
-HPHP::Variant HPHP::f_evhttp_async_get(HPHP::String const&, HPHP::Array const&, int)
-_ZN4HPHP18f_evhttp_async_getERKNS_6StringERKNS_5ArrayEi
-
-(return value) => rax
-_rv => rdi
-url => rsi
-headers => rdx
-timeout => rcx
-*/
-
 TypedValue* fh_evhttp_async_get(TypedValue* _rv, Value* url, Value* headers, int timeout) asm("_ZN4HPHP18f_evhttp_async_getERKNS_6StringERKNS_5ArrayEi");
 
-/*
-HPHP::Variant HPHP::f_evhttp_async_post(HPHP::String const&, HPHP::String const&, HPHP::Array const&, int)
-_ZN4HPHP19f_evhttp_async_postERKNS_6StringES2_RKNS_5ArrayEi
-
-(return value) => rax
-_rv => rdi
-url => rsi
-data => rdx
-headers => rcx
-timeout => r8
-*/
-
 TypedValue* fh_evhttp_async_post(TypedValue* _rv, Value* url, Value* data, Value* headers, int timeout) asm("_ZN4HPHP19f_evhttp_async_postERKNS_6StringES2_RKNS_5ArrayEi");
 
-/*
-HPHP::Variant HPHP::f_evhttp_recv(HPHP::Object const&)
-_ZN4HPHP13f_evhttp_recvERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-handle => rsi
-*/
-
 TypedValue* fh_evhttp_recv(TypedValue* _rv, Value* handle) asm("_ZN4HPHP13f_evhttp_recvERKNS_6ObjectE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_datetime.ext_hhvm.h

@@ -16,568 +16,100 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_checkdate(int, int, int)
-_ZN4HPHP11f_checkdateEiii
-
-(return value) => rax
-month => rdi
-day => rsi
-year => rdx
-*/
-
-bool fh_checkdate(int month, int day, int year) asm("_ZN4HPHP11f_checkdateEiii");
-
-/*
-HPHP::Object HPHP::f_date_add(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP10f_date_addERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-datetime => rsi
-interval => rdx
-*/
-
-Value* fh_date_add(Value* _rv, Value* datetime, Value* interval) asm("_ZN4HPHP10f_date_addERKNS_6ObjectES2_");
-
-/*
-HPHP::Object HPHP::f_date_create_from_format(HPHP::String const&, HPHP::String const&, HPHP::Object const&)
-_ZN4HPHP25f_date_create_from_formatERKNS_6StringES2_RKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-format => rsi
-time => rdx
-timezone => rcx
-*/
-
-Value* fh_date_create_from_format(Value* _rv, Value* format, Value* time, Value* timezone) asm("_ZN4HPHP25f_date_create_from_formatERKNS_6StringES2_RKNS_6ObjectE");
-
-/*
-HPHP::Object HPHP::f_date_create(HPHP::String const&, HPHP::Object const&)
-_ZN4HPHP13f_date_createERKNS_6StringERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-time => rsi
-timezone => rdx
-*/
-
-Value* fh_date_create(Value* _rv, Value* time, Value* timezone) asm("_ZN4HPHP13f_date_createERKNS_6StringERKNS_6ObjectE");
-
-/*
-void HPHP::f_date_date_set(HPHP::Object const&, int, int, int)
-_ZN4HPHP15f_date_date_setERKNS_6ObjectEiii
-
-object => rdi
-year => rsi
-month => rdx
-day => rcx
-*/
-
-void fh_date_date_set(Value* object, int year, int month, int day) asm("_ZN4HPHP15f_date_date_setERKNS_6ObjectEiii");
-
-/*
-HPHP::String HPHP::f_date_default_timezone_get()
-_ZN4HPHP27f_date_default_timezone_getEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_date_default_timezone_get(Value* _rv) asm("_ZN4HPHP27f_date_default_timezone_getEv");
-
-/*
-bool HPHP::f_date_default_timezone_set(HPHP::String const&)
-_ZN4HPHP27f_date_default_timezone_setERKNS_6StringE
-
-(return value) => rax
-name => rdi
-*/
-
-bool fh_date_default_timezone_set(Value* name) asm("_ZN4HPHP27f_date_default_timezone_setERKNS_6StringE");
-
-/*
-HPHP::Object HPHP::f_date_diff(HPHP::Object const&, HPHP::Object const&, bool)
-_ZN4HPHP11f_date_diffERKNS_6ObjectES2_b
-
-(return value) => rax
-_rv => rdi
-datetime => rsi
-datetime2 => rdx
-absolute => rcx
-*/
-
-Value* fh_date_diff(Value* _rv, Value* datetime, Value* datetime2, bool absolute) asm("_ZN4HPHP11f_date_diffERKNS_6ObjectES2_b");
-
-/*
-HPHP::String HPHP::f_date_format(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP13f_date_formatERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-format => rdx
-*/
-
-Value* fh_date_format(Value* _rv, Value* object, Value* format) asm("_ZN4HPHP13f_date_formatERKNS_6ObjectERKNS_6StringE");
-
-/*
-HPHP::Array HPHP::f_date_get_last_errors()
-_ZN4HPHP22f_date_get_last_errorsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_date_get_last_errors(Value* _rv) asm("_ZN4HPHP22f_date_get_last_errorsEv");
-
-/*
-HPHP::Object HPHP::f_date_interval_create_from_date_string(HPHP::String const&)
-_ZN4HPHP39f_date_interval_create_from_date_stringERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-time => rsi
-*/
-
-Value* fh_date_interval_create_from_date_string(Value* _rv, Value* time) asm("_ZN4HPHP39f_date_interval_create_from_date_stringERKNS_6StringE");
-
-/*
-HPHP::String HPHP::f_date_interval_format(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP22f_date_interval_formatERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-interval => rsi
-format_spec => rdx
-*/
-
-Value* fh_date_interval_format(Value* _rv, Value* interval, Value* format_spec) asm("_ZN4HPHP22f_date_interval_formatERKNS_6ObjectERKNS_6StringE");
-
-/*
-void HPHP::f_date_isodate_set(HPHP::Object const&, int, int, int)
-_ZN4HPHP18f_date_isodate_setERKNS_6ObjectEiii
-
-object => rdi
-year => rsi
-week => rdx
-day => rcx
-*/
-
-void fh_date_isodate_set(Value* object, int year, int week, int day) asm("_ZN4HPHP18f_date_isodate_setERKNS_6ObjectEiii");
-
-/*
-void HPHP::f_date_modify(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP13f_date_modifyERKNS_6ObjectERKNS_6StringE
-
-object => rdi
-modify => rsi
-*/
-
-void fh_date_modify(Value* object, Value* modify) asm("_ZN4HPHP13f_date_modifyERKNS_6ObjectERKNS_6StringE");
-
-/*
-long HPHP::f_date_offset_get(HPHP::Object const&)
-_ZN4HPHP17f_date_offset_getERKNS_6ObjectE
-
-(return value) => rax
-object => rdi
-*/
-
-long fh_date_offset_get(Value* object) asm("_ZN4HPHP17f_date_offset_getERKNS_6ObjectE");
-
-/*
-HPHP::Variant HPHP::f_date_parse(HPHP::String const&)
-_ZN4HPHP12f_date_parseERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-date => rsi
-*/
-
-TypedValue* fh_date_parse(TypedValue* _rv, Value* date) asm("_ZN4HPHP12f_date_parseERKNS_6StringE");
-
-/*
-HPHP::Object HPHP::f_date_sub(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP10f_date_subERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-datetime => rsi
-interval => rdx
-*/
-
-Value* fh_date_sub(Value* _rv, Value* datetime, Value* interval) asm("_ZN4HPHP10f_date_subERKNS_6ObjectES2_");
-
-/*
-HPHP::Array HPHP::f_date_sun_info(long, double, double)
-_ZN4HPHP15f_date_sun_infoEldd
-
-(return value) => rax
-_rv => rdi
-ts => rsi
-latitude => xmm0
-longitude => xmm1
-*/
-
-Value* fh_date_sun_info(Value* _rv, long ts, double latitude, double longitude) asm("_ZN4HPHP15f_date_sun_infoEldd");
-
-/*
-HPHP::Variant HPHP::f_date_sunrise(long, int, double, double, double, double)
-_ZN4HPHP14f_date_sunriseElidddd
-
-(return value) => rax
-_rv => rdi
-timestamp => rsi
-format => rdx
-latitude => xmm0
-longitude => xmm1
-zenith => xmm2
-gmt_offset => xmm3
-*/
-
-TypedValue* fh_date_sunrise(TypedValue* _rv, long timestamp, int format, double latitude, double longitude, double zenith, double gmt_offset) asm("_ZN4HPHP14f_date_sunriseElidddd");
-
-/*
-HPHP::Variant HPHP::f_date_sunset(long, int, double, double, double, double)
-_ZN4HPHP13f_date_sunsetElidddd
-
-(return value) => rax
-_rv => rdi
-timestamp => rsi
-format => rdx
-latitude => xmm0
-longitude => xmm1
-zenith => xmm2
-gmt_offset => xmm3
-*/
-
-TypedValue* fh_date_sunset(TypedValue* _rv, long timestamp, int format, double latitude, double longitude, double zenith, double gmt_offset) asm("_ZN4HPHP13f_date_sunsetElidddd");
-
-/*
-void HPHP::f_date_time_set(HPHP::Object const&, int, int, int)
-_ZN4HPHP15f_date_time_setERKNS_6ObjectEiii
-
-object => rdi
-hour => rsi
-minute => rdx
-second => rcx
-*/
-
-void fh_date_time_set(Value* object, int hour, int minute, int second) asm("_ZN4HPHP15f_date_time_setERKNS_6ObjectEiii");
-
-/*
-long HPHP::f_date_timestamp_get(HPHP::Object const&)
-_ZN4HPHP20f_date_timestamp_getERKNS_6ObjectE
-
-(return value) => rax
-datetime => rdi
-*/
-
-long fh_date_timestamp_get(Value* datetime) asm("_ZN4HPHP20f_date_timestamp_getERKNS_6ObjectE");
-
-/*
-HPHP::Object HPHP::f_date_timestamp_set(HPHP::Object const&, long)
-_ZN4HPHP20f_date_timestamp_setERKNS_6ObjectEl
-
-(return value) => rax
-_rv => rdi
-datetime => rsi
-timestamp => rdx
-*/
-
-Value* fh_date_timestamp_set(Value* _rv, Value* datetime, long timestamp) asm("_ZN4HPHP20f_date_timestamp_setERKNS_6ObjectEl");
-
-/*
-HPHP::Variant HPHP::f_date_timezone_get(HPHP::Object const&)
-_ZN4HPHP19f_date_timezone_getERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
-
-TypedValue* fh_date_timezone_get(TypedValue* _rv, Value* object) asm("_ZN4HPHP19f_date_timezone_getERKNS_6ObjectE");
-
-/*
-void HPHP::f_date_timezone_set(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP19f_date_timezone_setERKNS_6ObjectES2_
-
-object => rdi
-timezone => rsi
-*/
-
-void fh_date_timezone_set(Value* object, Value* timezone) asm("_ZN4HPHP19f_date_timezone_setERKNS_6ObjectES2_");
-
-/*
-HPHP::Variant HPHP::f_date(HPHP::String const&, long)
-_ZN4HPHP6f_dateERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-format => rsi
-timestamp => rdx
-*/
-
-TypedValue* fh_date(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP6f_dateERKNS_6StringEl");
-
-/*
-HPHP::Array HPHP::f_getdate(long)
-_ZN4HPHP9f_getdateEl
-
-(return value) => rax
-_rv => rdi
-timestamp => rsi
-*/
-
-Value* fh_getdate(Value* _rv, long timestamp) asm("_ZN4HPHP9f_getdateEl");
-
-/*
-HPHP::Variant HPHP::f_gettimeofday(bool)
-_ZN4HPHP14f_gettimeofdayEb
-
-(return value) => rax
-_rv => rdi
-return_float => rsi
-*/
-
 TypedValue* fh_gettimeofday(TypedValue* _rv, bool return_float) asm("_ZN4HPHP14f_gettimeofdayEb");
 
-/*
-HPHP::Variant HPHP::f_gmdate(HPHP::String const&, long)
-_ZN4HPHP8f_gmdateERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-format => rsi
-timestamp => rdx
-*/
-
-TypedValue* fh_gmdate(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP8f_gmdateERKNS_6StringEl");
-
-/*
-HPHP::Variant HPHP::f_gmmktime(int, int, int, int, int, int)
-_ZN4HPHP10f_gmmktimeEiiiiii
-
-(return value) => rax
-_rv => rdi
-hour => rsi
-minute => rdx
-second => rcx
-month => r8
-day => r9
-year => st0
-*/
-
-TypedValue* fh_gmmktime(TypedValue* _rv, int hour, int minute, int second, int month, int day, int year) asm("_ZN4HPHP10f_gmmktimeEiiiiii");
-
-/*
-HPHP::String HPHP::f_gmstrftime(HPHP::String const&, long)
-_ZN4HPHP12f_gmstrftimeERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-format => rsi
-timestamp => rdx
-*/
-
-Value* fh_gmstrftime(Value* _rv, Value* format, long timestamp) asm("_ZN4HPHP12f_gmstrftimeERKNS_6StringEl");
-
-/*
-HPHP::Variant HPHP::f_idate(HPHP::String const&, long)
-_ZN4HPHP7f_idateERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-format => rsi
-timestamp => rdx
-*/
-
-TypedValue* fh_idate(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP7f_idateERKNS_6StringEl");
-
-/*
-HPHP::Array HPHP::f_localtime(long, bool)
-_ZN4HPHP11f_localtimeElb
-
-(return value) => rax
-_rv => rdi
-timestamp => rsi
-is_associative => rdx
-*/
-
-Value* fh_localtime(Value* _rv, long timestamp, bool is_associative) asm("_ZN4HPHP11f_localtimeElb");
-
-/*
-HPHP::Variant HPHP::f_microtime(bool)
-_ZN4HPHP11f_microtimeEb
-
-(return value) => rax
-_rv => rdi
-get_as_float => rsi
-*/
-
 TypedValue* fh_microtime(TypedValue* _rv, bool get_as_float) asm("_ZN4HPHP11f_microtimeEb");
 
-/*
-HPHP::Variant HPHP::f_mktime(int, int, int, int, int, int)
-_ZN4HPHP8f_mktimeEiiiiii
-
-(return value) => rax
-_rv => rdi
-hour => rsi
-minute => rdx
-second => rcx
-month => r8
-day => r9
-year => st0
-*/
+long fh_time() asm("_ZN4HPHP6f_timeEv");
 
 TypedValue* fh_mktime(TypedValue* _rv, int hour, int minute, int second, int month, int day, int year) asm("_ZN4HPHP8f_mktimeEiiiiii");
 
-/*
-HPHP::Variant HPHP::f_strftime(HPHP::String const&, long)
-_ZN4HPHP10f_strftimeERKNS_6StringEl
+TypedValue* fh_gmmktime(TypedValue* _rv, int hour, int minute, int second, int month, int day, int year) asm("_ZN4HPHP10f_gmmktimeEiiiiii");
 
-(return value) => rax
-_rv => rdi
-format => rsi
-timestamp => rdx
-*/
+TypedValue* fh_idate(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP7f_idateERKNS_6StringEl");
+
+TypedValue* fh_date(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP6f_dateERKNS_6StringEl");
+
+TypedValue* fh_gmdate(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP8f_gmdateERKNS_6StringEl");
 
 TypedValue* fh_strftime(TypedValue* _rv, Value* format, long timestamp) asm("_ZN4HPHP10f_strftimeERKNS_6StringEl");
 
-/*
-HPHP::Variant HPHP::f_strptime(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP10f_strptimeERKNS_6StringES2_
+Value* fh_gmstrftime(Value* _rv, Value* format, long timestamp) asm("_ZN4HPHP12f_gmstrftimeERKNS_6StringEl");
 
-(return value) => rax
-_rv => rdi
-date => rsi
-format => rdx
-*/
+Value* fh_getdate(Value* _rv, long timestamp) asm("_ZN4HPHP9f_getdateEl");
+
+Value* fh_localtime(Value* _rv, long timestamp, bool is_associative) asm("_ZN4HPHP11f_localtimeElb");
 
 TypedValue* fh_strptime(TypedValue* _rv, Value* date, Value* format) asm("_ZN4HPHP10f_strptimeERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_strtotime(HPHP::String const&, long)
-_ZN4HPHP11f_strtotimeERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-input => rsi
-timestamp => rdx
-*/
-
 TypedValue* fh_strtotime(TypedValue* _rv, Value* input, long timestamp) asm("_ZN4HPHP11f_strtotimeERKNS_6StringEl");
 
-/*
-long HPHP::f_time()
-_ZN4HPHP6f_timeEv
+Value* fh_date_default_timezone_get(Value* _rv) asm("_ZN4HPHP27f_date_default_timezone_getEv");
 
-(return value) => rax
-*/
-
-long fh_time() asm("_ZN4HPHP6f_timeEv");
-
-/*
-HPHP::Array HPHP::f_timezone_abbreviations_list()
-_ZN4HPHP29f_timezone_abbreviations_listEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_timezone_abbreviations_list(Value* _rv) asm("_ZN4HPHP29f_timezone_abbreviations_listEv");
-
-/*
-HPHP::Array HPHP::f_timezone_identifiers_list()
-_ZN4HPHP27f_timezone_identifiers_listEv
-
-(return value) => rax
-_rv => rdi
-*/
+bool fh_date_default_timezone_set(Value* name) asm("_ZN4HPHP27f_date_default_timezone_setERKNS_6StringE");
 
 Value* fh_timezone_identifiers_list(Value* _rv) asm("_ZN4HPHP27f_timezone_identifiers_listEv");
 
-/*
-HPHP::Array HPHP::f_timezone_location_get(HPHP::Object const&)
-_ZN4HPHP23f_timezone_location_getERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-timezone => rsi
-*/
-
-Value* fh_timezone_location_get(Value* _rv, Value* timezone) asm("_ZN4HPHP23f_timezone_location_getERKNS_6ObjectE");
-
-/*
-HPHP::Variant HPHP::f_timezone_name_from_abbr(HPHP::String const&, int, bool)
-_ZN4HPHP25f_timezone_name_from_abbrERKNS_6StringEib
-
-(return value) => rax
-_rv => rdi
-abbr => rsi
-gmtoffset => rdx
-isdst => rcx
-*/
+Value* fh_timezone_abbreviations_list(Value* _rv) asm("_ZN4HPHP29f_timezone_abbreviations_listEv");
 
 TypedValue* fh_timezone_name_from_abbr(TypedValue* _rv, Value* abbr, int gmtoffset, bool isdst) asm("_ZN4HPHP25f_timezone_name_from_abbrERKNS_6StringEib");
 
-/*
-HPHP::String HPHP::f_timezone_name_get(HPHP::Object const&)
-_ZN4HPHP19f_timezone_name_getERKNS_6ObjectE
+Value* fh_timezone_open(Value* _rv, Value* timezone) asm("_ZN4HPHP15f_timezone_openERKNS_6StringE");
 
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
+Value* fh_timezone_location_get(Value* _rv, Value* timezone) asm("_ZN4HPHP23f_timezone_location_getERKNS_6ObjectE");
 
 Value* fh_timezone_name_get(Value* _rv, Value* object) asm("_ZN4HPHP19f_timezone_name_getERKNS_6ObjectE");
 
-/*
-long HPHP::f_timezone_offset_get(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP21f_timezone_offset_getERKNS_6ObjectES2_
-
-(return value) => rax
-object => rdi
-dt => rsi
-*/
-
 long fh_timezone_offset_get(Value* object, Value* dt) asm("_ZN4HPHP21f_timezone_offset_getERKNS_6ObjectES2_");
 
-/*
-HPHP::Object HPHP::f_timezone_open(HPHP::String const&)
-_ZN4HPHP15f_timezone_openERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-timezone => rsi
-*/
-
-Value* fh_timezone_open(Value* _rv, Value* timezone) asm("_ZN4HPHP15f_timezone_openERKNS_6StringE");
-
-/*
-HPHP::Array HPHP::f_timezone_transitions_get(HPHP::Object const&)
-_ZN4HPHP26f_timezone_transitions_getERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-object => rsi
-*/
-
 Value* fh_timezone_transitions_get(Value* _rv, Value* object) asm("_ZN4HPHP26f_timezone_transitions_getERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_timezone_version_get()
-_ZN4HPHP22f_timezone_version_getEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_timezone_version_get(Value* _rv) asm("_ZN4HPHP22f_timezone_version_getEv");
 
+bool fh_checkdate(int month, int day, int year) asm("_ZN4HPHP11f_checkdateEiii");
 
-} // !HPHP
+Value* fh_date_add(Value* _rv, Value* datetime, Value* interval) asm("_ZN4HPHP10f_date_addERKNS_6ObjectES2_");
 
+Value* fh_date_create_from_format(Value* _rv, Value* format, Value* time, Value* timezone) asm("_ZN4HPHP25f_date_create_from_formatERKNS_6StringES2_RKNS_6ObjectE");
+
+Value* fh_date_create(Value* _rv, Value* time, Value* timezone) asm("_ZN4HPHP13f_date_createERKNS_6StringERKNS_6ObjectE");
+
+void fh_date_date_set(Value* object, int year, int month, int day) asm("_ZN4HPHP15f_date_date_setERKNS_6ObjectEiii");
+
+Value* fh_date_diff(Value* _rv, Value* datetime, Value* datetime2, bool absolute) asm("_ZN4HPHP11f_date_diffERKNS_6ObjectES2_b");
+
+void fh_date_isodate_set(Value* object, int year, int week, int day) asm("_ZN4HPHP18f_date_isodate_setERKNS_6ObjectEiii");
+
+Value* fh_date_format(Value* _rv, Value* object, Value* format) asm("_ZN4HPHP13f_date_formatERKNS_6ObjectERKNS_6StringE");
+
+Value* fh_date_get_last_errors(Value* _rv) asm("_ZN4HPHP22f_date_get_last_errorsEv");
+
+Value* fh_date_interval_create_from_date_string(Value* _rv, Value* time) asm("_ZN4HPHP39f_date_interval_create_from_date_stringERKNS_6StringE");
+
+Value* fh_date_interval_format(Value* _rv, Value* interval, Value* format_spec) asm("_ZN4HPHP22f_date_interval_formatERKNS_6ObjectERKNS_6StringE");
+
+void fh_date_modify(Value* object, Value* modify) asm("_ZN4HPHP13f_date_modifyERKNS_6ObjectERKNS_6StringE");
+
+long fh_date_offset_get(Value* object) asm("_ZN4HPHP17f_date_offset_getERKNS_6ObjectE");
+
+TypedValue* fh_date_parse(TypedValue* _rv, Value* date) asm("_ZN4HPHP12f_date_parseERKNS_6StringE");
+
+void fh_date_time_set(Value* object, int hour, int minute, int second) asm("_ZN4HPHP15f_date_time_setERKNS_6ObjectEiii");
+
+long fh_date_timestamp_get(Value* datetime) asm("_ZN4HPHP20f_date_timestamp_getERKNS_6ObjectE");
+
+Value* fh_date_timestamp_set(Value* _rv, Value* datetime, long timestamp) asm("_ZN4HPHP20f_date_timestamp_setERKNS_6ObjectEl");
+
+TypedValue* fh_date_timezone_get(TypedValue* _rv, Value* object) asm("_ZN4HPHP19f_date_timezone_getERKNS_6ObjectE");
+
+void fh_date_timezone_set(Value* object, Value* timezone) asm("_ZN4HPHP19f_date_timezone_setERKNS_6ObjectES2_");
+
+Value* fh_date_sub(Value* _rv, Value* datetime, Value* interval) asm("_ZN4HPHP10f_date_subERKNS_6ObjectES2_");
+
+Value* fh_date_sun_info(Value* _rv, long ts, double latitude, double longitude) asm("_ZN4HPHP15f_date_sun_infoEldd");
+
+TypedValue* fh_date_sunrise(TypedValue* _rv, long timestamp, int format, double latitude, double longitude, double zenith, double gmt_offset) asm("_ZN4HPHP14f_date_sunriseElidddd");
+
+TypedValue* fh_date_sunset(TypedValue* _rv, long timestamp, int format, double latitude, double longitude, double zenith, double gmt_offset) asm("_ZN4HPHP13f_date_sunsetElidddd");
+
+} // namespace HPHP

hphp/runtime/ext/ext_debugger.ext_hhvm.h

@@ -16,59 +16,14 @@
 */
 namespace HPHP {
 
-/*
-bool HPHP::f_hphpd_install_user_command(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP28f_hphpd_install_user_commandERKNS_6StringES2_
-
-(return value) => rax
-cmd => rdi
-clsname => rsi
-*/
-
 bool fh_hphpd_install_user_command(Value* cmd, Value* clsname) asm("_ZN4HPHP28f_hphpd_install_user_commandERKNS_6StringES2_");
 
-/*
-HPHP::Array HPHP::f_hphpd_get_user_commands()
-_ZN4HPHP25f_hphpd_get_user_commandsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_hphpd_get_user_commands(Value* _rv) asm("_ZN4HPHP25f_hphpd_get_user_commandsEv");
 
-/*
-void HPHP::f_hphpd_break(bool)
-_ZN4HPHP13f_hphpd_breakEb
-
-condition => rdi
-*/
-
 void fh_hphpd_break(bool condition) asm("_ZN4HPHP13f_hphpd_breakEb");
 
-/*
-HPHP::Variant HPHP::f_hphpd_get_client(HPHP::String const&)
-_ZN4HPHP18f_hphpd_get_clientERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-name => rsi
-*/
-
 TypedValue* fh_hphpd_get_client(TypedValue* _rv, Value* name) asm("_ZN4HPHP18f_hphpd_get_clientERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_hphpd_client_ctrl(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP19f_hphpd_client_ctrlERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-name => rsi
-op => rdx
-*/
-
 TypedValue* fh_hphpd_client_ctrl(TypedValue* _rv, Value* name, Value* op) asm("_ZN4HPHP19f_hphpd_client_ctrlERKNS_6StringES2_");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_domdocument.ext_hhvm.h

@@ -16,894 +16,148 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_element(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP29f_dom_document_create_elementERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-value => rcx
-*/
-
 TypedValue* fh_dom_document_create_element(TypedValue* _rv, TypedValue* obj, Value* name, Value* value) asm("_ZN4HPHP29f_dom_document_create_elementERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_document_fragment(HPHP::Variant const&)
-_ZN4HPHP39f_dom_document_create_document_fragmentERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_document_create_document_fragment(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP39f_dom_document_create_document_fragmentERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_text_node(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP31f_dom_document_create_text_nodeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-data => rdx
-*/
-
 TypedValue* fh_dom_document_create_text_node(TypedValue* _rv, TypedValue* obj, Value* data) asm("_ZN4HPHP31f_dom_document_create_text_nodeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_comment(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP29f_dom_document_create_commentERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-data => rdx
-*/
-
 TypedValue* fh_dom_document_create_comment(TypedValue* _rv, TypedValue* obj, Value* data) asm("_ZN4HPHP29f_dom_document_create_commentERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_cdatasection(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP34f_dom_document_create_cdatasectionERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-data => rdx
-*/
-
 TypedValue* fh_dom_document_create_cdatasection(TypedValue* _rv, TypedValue* obj, Value* data) asm("_ZN4HPHP34f_dom_document_create_cdatasectionERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_processing_instruction(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP44f_dom_document_create_processing_instructionERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-target => rdx
-data => rcx
-*/
-
 TypedValue* fh_dom_document_create_processing_instruction(TypedValue* _rv, TypedValue* obj, Value* target, Value* data) asm("_ZN4HPHP44f_dom_document_create_processing_instructionERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_attribute(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP31f_dom_document_create_attributeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_document_create_attribute(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP31f_dom_document_create_attributeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_entity_reference(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP38f_dom_document_create_entity_referenceERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_document_create_entity_reference(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP38f_dom_document_create_entity_referenceERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_get_elements_by_tag_name(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP39f_dom_document_get_elements_by_tag_nameERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_document_get_elements_by_tag_name(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP39f_dom_document_get_elements_by_tag_nameERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_import_node(HPHP::Variant const&, HPHP::Object const&, bool)
-_ZN4HPHP26f_dom_document_import_nodeERKNS_7VariantERKNS_6ObjectEb
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-importednode => rdx
-deep => rcx
-*/
-
 TypedValue* fh_dom_document_import_node(TypedValue* _rv, TypedValue* obj, Value* importednode, bool deep) asm("_ZN4HPHP26f_dom_document_import_nodeERKNS_7VariantERKNS_6ObjectEb");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_element_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP32f_dom_document_create_element_nsERKNS_7VariantERKNS_6StringES5_S5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-qualifiedname => rcx
-value => r8
-*/
-
 TypedValue* fh_dom_document_create_element_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* qualifiedname, Value* value) asm("_ZN4HPHP32f_dom_document_create_element_nsERKNS_7VariantERKNS_6StringES5_S5_");
 
-/*
-HPHP::Variant HPHP::f_dom_document_create_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP34f_dom_document_create_attribute_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-qualifiedname => rcx
-*/
-
 TypedValue* fh_dom_document_create_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* qualifiedname) asm("_ZN4HPHP34f_dom_document_create_attribute_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_document_get_elements_by_tag_name_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP42f_dom_document_get_elements_by_tag_name_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_document_get_elements_by_tag_name_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP42f_dom_document_get_elements_by_tag_name_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_document_get_element_by_id(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP32f_dom_document_get_element_by_idERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-elementid => rdx
-*/
-
 TypedValue* fh_dom_document_get_element_by_id(TypedValue* _rv, TypedValue* obj, Value* elementid) asm("_ZN4HPHP32f_dom_document_get_element_by_idERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_normalize_document(HPHP::Variant const&)
-_ZN4HPHP33f_dom_document_normalize_documentERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_document_normalize_document(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP33f_dom_document_normalize_documentERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_save(HPHP::Variant const&, HPHP::String const&, long)
-_ZN4HPHP19f_dom_document_saveERKNS_7VariantERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-file => rdx
-options => rcx
-*/
-
 TypedValue* fh_dom_document_save(TypedValue* _rv, TypedValue* obj, Value* file, long options) asm("_ZN4HPHP19f_dom_document_saveERKNS_7VariantERKNS_6StringEl");
 
-/*
-HPHP::Variant HPHP::f_dom_document_savexml(HPHP::Variant const&, HPHP::Object const&, long)
-_ZN4HPHP22f_dom_document_savexmlERKNS_7VariantERKNS_6ObjectEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-node => rdx
-options => rcx
-*/
-
 TypedValue* fh_dom_document_savexml(TypedValue* _rv, TypedValue* obj, Value* node, long options) asm("_ZN4HPHP22f_dom_document_savexmlERKNS_7VariantERKNS_6ObjectEl");
 
-/*
-HPHP::Variant HPHP::f_dom_document_validate(HPHP::Variant const&)
-_ZN4HPHP23f_dom_document_validateERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_document_validate(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP23f_dom_document_validateERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_xinclude(HPHP::Variant const&, long)
-_ZN4HPHP23f_dom_document_xincludeERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-options => rdx
-*/
-
 TypedValue* fh_dom_document_xinclude(TypedValue* _rv, TypedValue* obj, long options) asm("_ZN4HPHP23f_dom_document_xincludeERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_dom_document_save_html(HPHP::Variant const&)
-_ZN4HPHP24f_dom_document_save_htmlERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_document_save_html(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP24f_dom_document_save_htmlERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_save_html_file(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP29f_dom_document_save_html_fileERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-file => rdx
-*/
-
 TypedValue* fh_dom_document_save_html_file(TypedValue* _rv, TypedValue* obj, Value* file) asm("_ZN4HPHP29f_dom_document_save_html_fileERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_schema_validate_file(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP35f_dom_document_schema_validate_fileERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-filename => rdx
-*/
-
 TypedValue* fh_dom_document_schema_validate_file(TypedValue* _rv, TypedValue* obj, Value* filename) asm("_ZN4HPHP35f_dom_document_schema_validate_fileERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_schema_validate_xml(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP34f_dom_document_schema_validate_xmlERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-source => rdx
-*/
-
 TypedValue* fh_dom_document_schema_validate_xml(TypedValue* _rv, TypedValue* obj, Value* source) asm("_ZN4HPHP34f_dom_document_schema_validate_xmlERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_relaxng_validate_file(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP36f_dom_document_relaxng_validate_fileERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-filename => rdx
-*/
-
 TypedValue* fh_dom_document_relaxng_validate_file(TypedValue* _rv, TypedValue* obj, Value* filename) asm("_ZN4HPHP36f_dom_document_relaxng_validate_fileERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_document_relaxng_validate_xml(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP35f_dom_document_relaxng_validate_xmlERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-source => rdx
-*/
-
 TypedValue* fh_dom_document_relaxng_validate_xml(TypedValue* _rv, TypedValue* obj, Value* source) asm("_ZN4HPHP35f_dom_document_relaxng_validate_xmlERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_insert_before(HPHP::Variant const&, HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP24f_dom_node_insert_beforeERKNS_7VariantERKNS_6ObjectES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-newnode => rdx
-refnode => rcx
-*/
-
 TypedValue* fh_dom_node_insert_before(TypedValue* _rv, TypedValue* obj, Value* newnode, Value* refnode) asm("_ZN4HPHP24f_dom_node_insert_beforeERKNS_7VariantERKNS_6ObjectES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_node_replace_child(HPHP::Variant const&, HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP24f_dom_node_replace_childERKNS_7VariantERKNS_6ObjectES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-newchildobj => rdx
-oldchildobj => rcx
-*/
-
 TypedValue* fh_dom_node_replace_child(TypedValue* _rv, TypedValue* obj, Value* newchildobj, Value* oldchildobj) asm("_ZN4HPHP24f_dom_node_replace_childERKNS_7VariantERKNS_6ObjectES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_node_remove_child(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP23f_dom_node_remove_childERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-node => rdx
-*/
-
 TypedValue* fh_dom_node_remove_child(TypedValue* _rv, TypedValue* obj, Value* node) asm("_ZN4HPHP23f_dom_node_remove_childERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_append_child(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP23f_dom_node_append_childERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-newnode => rdx
-*/
-
 TypedValue* fh_dom_node_append_child(TypedValue* _rv, TypedValue* obj, Value* newnode) asm("_ZN4HPHP23f_dom_node_append_childERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_has_child_nodes(HPHP::Variant const&)
-_ZN4HPHP26f_dom_node_has_child_nodesERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_node_has_child_nodes(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP26f_dom_node_has_child_nodesERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_clone_node(HPHP::Variant const&, bool)
-_ZN4HPHP21f_dom_node_clone_nodeERKNS_7VariantEb
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-deep => rdx
-*/
-
 TypedValue* fh_dom_node_clone_node(TypedValue* _rv, TypedValue* obj, bool deep) asm("_ZN4HPHP21f_dom_node_clone_nodeERKNS_7VariantEb");
 
-/*
-HPHP::Variant HPHP::f_dom_node_normalize(HPHP::Variant const&)
-_ZN4HPHP20f_dom_node_normalizeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_node_normalize(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP20f_dom_node_normalizeERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_is_supported(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP23f_dom_node_is_supportedERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-feature => rdx
-version => rcx
-*/
-
 TypedValue* fh_dom_node_is_supported(TypedValue* _rv, TypedValue* obj, Value* feature, Value* version) asm("_ZN4HPHP23f_dom_node_is_supportedERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_node_has_attributes(HPHP::Variant const&)
-_ZN4HPHP25f_dom_node_has_attributesERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_node_has_attributes(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP25f_dom_node_has_attributesERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_is_same_node(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP23f_dom_node_is_same_nodeERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-node => rdx
-*/
-
 TypedValue* fh_dom_node_is_same_node(TypedValue* _rv, TypedValue* obj, Value* node) asm("_ZN4HPHP23f_dom_node_is_same_nodeERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_lookup_prefix(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP24f_dom_node_lookup_prefixERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-prefix => rdx
-*/
-
 TypedValue* fh_dom_node_lookup_prefix(TypedValue* _rv, TypedValue* obj, Value* prefix) asm("_ZN4HPHP24f_dom_node_lookup_prefixERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_is_default_namespace(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP31f_dom_node_is_default_namespaceERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-*/
-
 TypedValue* fh_dom_node_is_default_namespace(TypedValue* _rv, TypedValue* obj, Value* namespaceuri) asm("_ZN4HPHP31f_dom_node_is_default_namespaceERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_node_lookup_namespace_uri(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP31f_dom_node_lookup_namespace_uriERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-*/
-
 TypedValue* fh_dom_node_lookup_namespace_uri(TypedValue* _rv, TypedValue* obj, Value* namespaceuri) asm("_ZN4HPHP31f_dom_node_lookup_namespace_uriERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_nodelist_item(HPHP::Variant const&, long)
-_ZN4HPHP19f_dom_nodelist_itemERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-index => rdx
-*/
-
 TypedValue* fh_dom_nodelist_item(TypedValue* _rv, TypedValue* obj, long index) asm("_ZN4HPHP19f_dom_nodelist_itemERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_dom_namednodemap_get_named_item(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP33f_dom_namednodemap_get_named_itemERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_namednodemap_get_named_item(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP33f_dom_namednodemap_get_named_itemERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_namednodemap_item(HPHP::Variant const&, long)
-_ZN4HPHP23f_dom_namednodemap_itemERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-index => rdx
-*/
-
 TypedValue* fh_dom_namednodemap_item(TypedValue* _rv, TypedValue* obj, long index) asm("_ZN4HPHP23f_dom_namednodemap_itemERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_dom_namednodemap_get_named_item_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP36f_dom_namednodemap_get_named_item_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_namednodemap_get_named_item_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP36f_dom_namednodemap_get_named_item_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_characterdata_substring_data(HPHP::Variant const&, long, long)
-_ZN4HPHP34f_dom_characterdata_substring_dataERKNS_7VariantEll
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-offset => rdx
-count => rcx
-*/
-
 TypedValue* fh_dom_characterdata_substring_data(TypedValue* _rv, TypedValue* obj, long offset, long count) asm("_ZN4HPHP34f_dom_characterdata_substring_dataERKNS_7VariantEll");
 
-/*
-HPHP::Variant HPHP::f_dom_characterdata_append_data(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP31f_dom_characterdata_append_dataERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-arg => rdx
-*/
-
 TypedValue* fh_dom_characterdata_append_data(TypedValue* _rv, TypedValue* obj, Value* arg) asm("_ZN4HPHP31f_dom_characterdata_append_dataERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_characterdata_insert_data(HPHP::Variant const&, long, HPHP::String const&)
-_ZN4HPHP31f_dom_characterdata_insert_dataERKNS_7VariantElRKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-offset => rdx
-data => rcx
-*/
-
 TypedValue* fh_dom_characterdata_insert_data(TypedValue* _rv, TypedValue* obj, long offset, Value* data) asm("_ZN4HPHP31f_dom_characterdata_insert_dataERKNS_7VariantElRKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_characterdata_delete_data(HPHP::Variant const&, long, long)
-_ZN4HPHP31f_dom_characterdata_delete_dataERKNS_7VariantEll
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-offset => rdx
-count => rcx
-*/
-
 TypedValue* fh_dom_characterdata_delete_data(TypedValue* _rv, TypedValue* obj, long offset, long count) asm("_ZN4HPHP31f_dom_characterdata_delete_dataERKNS_7VariantEll");
 
-/*
-HPHP::Variant HPHP::f_dom_characterdata_replace_data(HPHP::Variant const&, long, long, HPHP::String const&)
-_ZN4HPHP32f_dom_characterdata_replace_dataERKNS_7VariantEllRKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-offset => rdx
-count => rcx
-data => r8
-*/
-
 TypedValue* fh_dom_characterdata_replace_data(TypedValue* _rv, TypedValue* obj, long offset, long count, Value* data) asm("_ZN4HPHP32f_dom_characterdata_replace_dataERKNS_7VariantEllRKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_attr_is_id(HPHP::Variant const&)
-_ZN4HPHP16f_dom_attr_is_idERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_attr_is_id(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP16f_dom_attr_is_idERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_attribute(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP27f_dom_element_get_attributeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_element_get_attribute(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP27f_dom_element_get_attributeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_attribute(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP27f_dom_element_set_attributeERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-value => rcx
-*/
-
 TypedValue* fh_dom_element_set_attribute(TypedValue* _rv, TypedValue* obj, Value* name, Value* value) asm("_ZN4HPHP27f_dom_element_set_attributeERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_remove_attribute(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP30f_dom_element_remove_attributeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_element_remove_attribute(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP30f_dom_element_remove_attributeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_attribute_node(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP32f_dom_element_get_attribute_nodeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_element_get_attribute_node(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP32f_dom_element_get_attribute_nodeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_attribute_node(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP32f_dom_element_set_attribute_nodeERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-newattr => rdx
-*/
-
 TypedValue* fh_dom_element_set_attribute_node(TypedValue* _rv, TypedValue* obj, Value* newattr) asm("_ZN4HPHP32f_dom_element_set_attribute_nodeERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_remove_attribute_node(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP35f_dom_element_remove_attribute_nodeERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-oldattr => rdx
-*/
-
 TypedValue* fh_dom_element_remove_attribute_node(TypedValue* _rv, TypedValue* obj, Value* oldattr) asm("_ZN4HPHP35f_dom_element_remove_attribute_nodeERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_elements_by_tag_name(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP38f_dom_element_get_elements_by_tag_nameERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_element_get_elements_by_tag_name(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP38f_dom_element_get_elements_by_tag_nameERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP30f_dom_element_get_attribute_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_element_get_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP30f_dom_element_get_attribute_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP30f_dom_element_set_attribute_nsERKNS_7VariantERKNS_6StringES5_S5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-name => rcx
-value => r8
-*/
-
 TypedValue* fh_dom_element_set_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* name, Value* value) asm("_ZN4HPHP30f_dom_element_set_attribute_nsERKNS_7VariantERKNS_6StringES5_S5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_remove_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP33f_dom_element_remove_attribute_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_element_remove_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP33f_dom_element_remove_attribute_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_attribute_node_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP35f_dom_element_get_attribute_node_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_element_get_attribute_node_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP35f_dom_element_get_attribute_node_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_attribute_node_ns(HPHP::Variant const&, HPHP::Object const&)
-_ZN4HPHP35f_dom_element_set_attribute_node_nsERKNS_7VariantERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-newattr => rdx
-*/
-
 TypedValue* fh_dom_element_set_attribute_node_ns(TypedValue* _rv, TypedValue* obj, Value* newattr) asm("_ZN4HPHP35f_dom_element_set_attribute_node_nsERKNS_7VariantERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_get_elements_by_tag_name_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP41f_dom_element_get_elements_by_tag_name_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_element_get_elements_by_tag_name_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP41f_dom_element_get_elements_by_tag_name_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_has_attribute(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP27f_dom_element_has_attributeERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-*/
-
 TypedValue* fh_dom_element_has_attribute(TypedValue* _rv, TypedValue* obj, Value* name) asm("_ZN4HPHP27f_dom_element_has_attributeERKNS_7VariantERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_dom_element_has_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP30f_dom_element_has_attribute_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-*/
-
 TypedValue* fh_dom_element_has_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname) asm("_ZN4HPHP30f_dom_element_has_attribute_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_id_attribute(HPHP::Variant const&, HPHP::String const&, bool)
-_ZN4HPHP30f_dom_element_set_id_attributeERKNS_7VariantERKNS_6StringEb
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-name => rdx
-isid => rcx
-*/
-
 TypedValue* fh_dom_element_set_id_attribute(TypedValue* _rv, TypedValue* obj, Value* name, bool isid) asm("_ZN4HPHP30f_dom_element_set_id_attributeERKNS_7VariantERKNS_6StringEb");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_id_attribute_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP33f_dom_element_set_id_attribute_nsERKNS_7VariantERKNS_6StringES5_b
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-namespaceuri => rdx
-localname => rcx
-isid => r8
-*/
-
 TypedValue* fh_dom_element_set_id_attribute_ns(TypedValue* _rv, TypedValue* obj, Value* namespaceuri, Value* localname, bool isid) asm("_ZN4HPHP33f_dom_element_set_id_attribute_nsERKNS_7VariantERKNS_6StringES5_b");
 
-/*
-HPHP::Variant HPHP::f_dom_element_set_id_attribute_node(HPHP::Variant const&, HPHP::Object const&, bool)
-_ZN4HPHP35f_dom_element_set_id_attribute_nodeERKNS_7VariantERKNS_6ObjectEb
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-idattr => rdx
-isid => rcx
-*/
-
 TypedValue* fh_dom_element_set_id_attribute_node(TypedValue* _rv, TypedValue* obj, Value* idattr, bool isid) asm("_ZN4HPHP35f_dom_element_set_id_attribute_nodeERKNS_7VariantERKNS_6ObjectEb");
 
-/*
-HPHP::Variant HPHP::f_dom_text_split_text(HPHP::Variant const&, long)
-_ZN4HPHP21f_dom_text_split_textERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-offset => rdx
-*/
-
 TypedValue* fh_dom_text_split_text(TypedValue* _rv, TypedValue* obj, long offset) asm("_ZN4HPHP21f_dom_text_split_textERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_dom_text_is_whitespace_in_element_content(HPHP::Variant const&)
-_ZN4HPHP43f_dom_text_is_whitespace_in_element_contentERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_dom_text_is_whitespace_in_element_content(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP43f_dom_text_is_whitespace_in_element_contentERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_dom_xpath_register_ns(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP23f_dom_xpath_register_nsERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-prefix => rdx
-uri => rcx
-*/
-
 TypedValue* fh_dom_xpath_register_ns(TypedValue* _rv, TypedValue* obj, Value* prefix, Value* uri) asm("_ZN4HPHP23f_dom_xpath_register_nsERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_dom_xpath_query(HPHP::Variant const&, HPHP::String const&, HPHP::Object const&)
-_ZN4HPHP17f_dom_xpath_queryERKNS_7VariantERKNS_6StringERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-expr => rdx
-context => rcx
-*/
-
 TypedValue* fh_dom_xpath_query(TypedValue* _rv, TypedValue* obj, Value* expr, Value* context) asm("_ZN4HPHP17f_dom_xpath_queryERKNS_7VariantERKNS_6StringERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_xpath_evaluate(HPHP::Variant const&, HPHP::String const&, HPHP::Object const&)
-_ZN4HPHP20f_dom_xpath_evaluateERKNS_7VariantERKNS_6StringERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-expr => rdx
-context => rcx
-*/
-
 TypedValue* fh_dom_xpath_evaluate(TypedValue* _rv, TypedValue* obj, Value* expr, Value* context) asm("_ZN4HPHP20f_dom_xpath_evaluateERKNS_7VariantERKNS_6StringERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_dom_xpath_register_php_functions(HPHP::Variant const&, HPHP::Variant const&)
-_ZN4HPHP34f_dom_xpath_register_php_functionsERKNS_7VariantES2_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-funcs => rdx
-*/
-
 TypedValue* fh_dom_xpath_register_php_functions(TypedValue* _rv, TypedValue* obj, TypedValue* funcs) asm("_ZN4HPHP34f_dom_xpath_register_php_functionsERKNS_7VariantES2_");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_error.ext_hhvm.cpp

@@ -14,151 +14,118 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::Array HPHP::f_debug_backtrace(bool)
-_ZN4HPHP17f_debug_backtraceEb
-
-(return value) => rax
-_rv => rdi
-provide_object => rsi
-*/
-
 Value* fh_debug_backtrace(Value* _rv, bool provide_object) asm("_ZN4HPHP17f_debug_backtraceEb");
 
-TypedValue * fg1_debug_backtrace(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_debug_backtrace(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_debug_backtrace(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_debug_backtrace(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfArray;
   tvCastToBooleanInPlace(args-0);
-  fh_debug_backtrace((&rv->m_data), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(true));
+  rv->m_type = KindOfArray;
+  fh_debug_backtrace(&(rv->m_data), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(true));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_debug_backtrace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count <= 1LL) {
-      if ((count <= 0 || (args-0)->m_type == KindOfBoolean)) {
-        rv.m_type = KindOfArray;
-        fh_debug_backtrace((&rv.m_data), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(true));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_debug_backtrace(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_debug_backtrace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count <= 1) {
+    if ((count <= 0 || (args - 0)->m_type == KindOfBoolean)) {
+      rv->m_type = KindOfArray;
+      fh_debug_backtrace(&(rv->m_data), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(true));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_toomany_arguments_nr("debug_backtrace", 1, 1);
+      fg1_debug_backtrace(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_toomany_arguments_nr("debug_backtrace", 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+Value* fh_hphp_debug_caller_info(Value* _rv) asm("_ZN4HPHP24f_hphp_debug_caller_infoEv");
 
-
-/*
-void HPHP::f_debug_print_backtrace()
-_ZN4HPHP23f_debug_print_backtraceEv
-
-*/
+TypedValue* fg_hphp_debug_caller_info(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfArray;
+    fh_hphp_debug_caller_info(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("hphp_debug_caller_info", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
 
 void fh_debug_print_backtrace() asm("_ZN4HPHP23f_debug_print_backtraceEv");
 
-TypedValue* fg_debug_print_backtrace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_debug_print_backtrace();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("debug_print_backtrace", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_debug_print_backtrace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_debug_print_backtrace();
+  } else {
+    throw_toomany_arguments_nr("debug_print_backtrace", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_error_get_last()
-_ZN4HPHP16f_error_get_lastEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_error_get_last(Value* _rv) asm("_ZN4HPHP16f_error_get_lastEv");
 
-TypedValue* fg_error_get_last(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfArray;
-      fh_error_get_last((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("error_get_last", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_error_get_last(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfArray;
+    fh_error_get_last(&(rv->m_data));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("error_get_last", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_error_log(HPHP::String const&, int, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_error_logERKNS_6StringEiS2_S2_
-
-(return value) => rax
-message => rdi
-message_type => rsi
-destination => rdx
-extra_headers => rcx
-*/
-
 bool fh_error_log(Value* message, int message_type, Value* destination, Value* extra_headers) asm("_ZN4HPHP11f_error_logERKNS_6StringEiS2_S2_");
 
-TypedValue * fg1_error_log(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_error_log(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_error_log(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_error_log(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   switch (count) {
   default: // count >= 4
     if (!IS_STRING_TYPE((args-3)->m_type)) {
@@ -178,404 +145,237 @@ TypedValue * fg1_error_log(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_error_log(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? &args[-3].m_data : (Value*)(&null_string))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_error_log(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 4LL) {
-      if ((count <= 3 || IS_STRING_TYPE((args-3)->m_type)) && (count <= 2 || IS_STRING_TYPE((args-2)->m_type)) && (count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_error_log(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? &args[-3].m_data : (Value*)(&null_string))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_error_log(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_error_log(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 4) {
+    if ((count <= 3 || IS_STRING_TYPE((args - 3)->m_type)) &&
+        (count <= 2 || IS_STRING_TYPE((args - 2)->m_type)) &&
+        (count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_error_log(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? &args[-3].m_data : (Value*)(&null_string))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("error_log", count, 1, 4, 1);
+      fg1_error_log(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("error_log", count, 1, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-long HPHP::f_error_reporting(HPHP::Variant const&)
-_ZN4HPHP17f_error_reportingERKNS_7VariantE
-
-(return value) => rax
-level => rdi
-*/
-
 long fh_error_reporting(TypedValue* level) asm("_ZN4HPHP17f_error_reportingERKNS_7VariantE");
 
-TypedValue* fg_error_reporting(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count <= 1LL) {
-      rv.m_type = KindOfInt64;
-      Variant defVal0;
-      rv.m_data.num = (int64_t)fh_error_reporting((count > 0) ? (args-0) : (TypedValue*)(&defVal0));
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("error_reporting", 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_error_reporting(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count <= 1) {
+    rv->m_type = KindOfInt64;
+    Variant defVal0;
+    rv->m_data.num = (int64_t)fh_error_reporting((count > 0) ? (args-0) : (TypedValue*)(&defVal0));
+  } else {
+    throw_toomany_arguments_nr("error_reporting", 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_restore_error_handler()
-_ZN4HPHP23f_restore_error_handlerEv
-
-(return value) => rax
-*/
-
 bool fh_restore_error_handler() asm("_ZN4HPHP23f_restore_error_handlerEv");
 
-TypedValue* fg_restore_error_handler(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_restore_error_handler()) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("restore_error_handler", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_restore_error_handler(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_restore_error_handler()) ? 1LL : 0LL;
+  } else {
+    throw_toomany_arguments_nr("restore_error_handler", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_restore_exception_handler()
-_ZN4HPHP27f_restore_exception_handlerEv
-
-(return value) => rax
-*/
-
 bool fh_restore_exception_handler() asm("_ZN4HPHP27f_restore_exception_handlerEv");
 
-TypedValue* fg_restore_exception_handler(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfBoolean;
-      rv.m_data.num = (fh_restore_exception_handler()) ? 1LL : 0LL;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("restore_exception_handler", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_restore_exception_handler(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfBoolean;
+    rv->m_data.num = (fh_restore_exception_handler()) ? 1LL : 0LL;
+  } else {
+    throw_toomany_arguments_nr("restore_exception_handler", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_set_error_handler(HPHP::Variant const&, int)
-_ZN4HPHP19f_set_error_handlerERKNS_7VariantEi
-
-(return value) => rax
-_rv => rdi
-error_handler => rsi
-error_types => rdx
-*/
-
 TypedValue* fh_set_error_handler(TypedValue* _rv, TypedValue* error_handler, int error_types) asm("_ZN4HPHP19f_set_error_handlerERKNS_7VariantEi");
 
-TypedValue * fg1_set_error_handler(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_set_error_handler(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_set_error_handler(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_set_error_handler(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   tvCastToInt64InPlace(args-1);
-  fh_set_error_handler((rv), (args-0), (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_ALL));
+  fh_set_error_handler(rv, (args-0), (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_ALL));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_set_error_handler(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64)) {
-        fh_set_error_handler((&(rv)), (args-0), (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_ALL));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_set_error_handler(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_set_error_handler(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64)) {
+      fh_set_error_handler(rv, (args-0), (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_ALL));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("set_error_handler", count, 1, 2, 1);
+      fg1_set_error_handler(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("set_error_handler", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_set_exception_handler(HPHP::Variant const&)
-_ZN4HPHP23f_set_exception_handlerERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-exception_handler => rsi
-*/
-
 TypedValue* fh_set_exception_handler(TypedValue* _rv, TypedValue* exception_handler) asm("_ZN4HPHP23f_set_exception_handlerERKNS_7VariantE");
 
-TypedValue* fg_set_exception_handler(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      fh_set_exception_handler((&(rv)), (args-0));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("set_exception_handler", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_set_exception_handler(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    fh_set_exception_handler(rv, (args-0));
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_wrong_arguments_nr("set_exception_handler", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_hphp_set_error_page(HPHP::String const&)
-_ZN4HPHP21f_hphp_set_error_pageERKNS_6StringE
-
-page => rdi
-*/
-
 void fh_hphp_set_error_page(Value* page) asm("_ZN4HPHP21f_hphp_set_error_pageERKNS_6StringE");
 
-TypedValue * fg1_hphp_set_error_page(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_hphp_set_error_page(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_hphp_set_error_page(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_hphp_set_error_page(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
   fh_hphp_set_error_page(&args[-0].m_data);
-  return rv;
 }
 
-TypedValue* fg_hphp_set_error_page(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        fh_hphp_set_error_page(&args[-0].m_data);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_hphp_set_error_page(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_hphp_set_error_page(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfNull;
+      fh_hphp_set_error_page(&args[-0].m_data);
     } else {
-      throw_wrong_arguments_nr("hphp_set_error_page", count, 1, 1, 1);
+      fg1_hphp_set_error_page(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("hphp_set_error_page", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_hphp_throw_fatal_error(HPHP::String const&)
-_ZN4HPHP24f_hphp_throw_fatal_errorERKNS_6StringE
-
-error_msg => rdi
-*/
-
 void fh_hphp_throw_fatal_error(Value* error_msg) asm("_ZN4HPHP24f_hphp_throw_fatal_errorERKNS_6StringE");
 
-TypedValue * fg1_hphp_throw_fatal_error(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_hphp_throw_fatal_error(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_hphp_throw_fatal_error(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_hphp_throw_fatal_error(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
   fh_hphp_throw_fatal_error(&args[-0].m_data);
-  return rv;
 }
 
-TypedValue* fg_hphp_throw_fatal_error(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        fh_hphp_throw_fatal_error(&args[-0].m_data);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_hphp_throw_fatal_error(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_hphp_throw_fatal_error(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfNull;
+      fh_hphp_throw_fatal_error(&args[-0].m_data);
     } else {
-      throw_wrong_arguments_nr("hphp_throw_fatal_error", count, 1, 1, 1);
+      fg1_hphp_throw_fatal_error(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("hphp_throw_fatal_error", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_hphp_clear_unflushed()
-_ZN4HPHP22f_hphp_clear_unflushedEv
-
-*/
-
 void fh_hphp_clear_unflushed() asm("_ZN4HPHP22f_hphp_clear_unflushedEv");
 
-TypedValue* fg_hphp_clear_unflushed(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_hphp_clear_unflushed();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("hphp_clear_unflushed", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_hphp_clear_unflushed(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_hphp_clear_unflushed();
+  } else {
+    throw_toomany_arguments_nr("hphp_clear_unflushed", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_hphp_debug_caller_info()
-_ZN4HPHP24f_hphp_debug_caller_infoEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_hphp_debug_caller_info(Value* _rv) asm("_ZN4HPHP24f_hphp_debug_caller_infoEv");
-
-TypedValue* fg_hphp_debug_caller_info(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_type = KindOfArray;
-      fh_hphp_debug_caller_info((&rv.m_data));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("hphp_debug_caller_info", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-/*
-bool HPHP::f_trigger_error(HPHP::String const&, int)
-_ZN4HPHP15f_trigger_errorERKNS_6StringEi
-
-(return value) => rax
-error_msg => rdi
-error_type => rsi
-*/
-
 bool fh_trigger_error(Value* error_msg, int error_type) asm("_ZN4HPHP15f_trigger_errorERKNS_6StringEi");
 
-TypedValue * fg1_trigger_error(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_trigger_error(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_trigger_error(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_trigger_error(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   switch (count) {
   default: // count >= 2
     if ((args-1)->m_type != KindOfInt64) {
@@ -587,55 +387,38 @@ TypedValue * fg1_trigger_error(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_trigger_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_trigger_error(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_trigger_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_trigger_error(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_trigger_error(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_trigger_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("trigger_error", count, 1, 2, 1);
+      fg1_trigger_error(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("trigger_error", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_user_error(HPHP::String const&, int)
-_ZN4HPHP12f_user_errorERKNS_6StringEi
-
-(return value) => rax
-error_msg => rdi
-error_type => rsi
-*/
-
 bool fh_user_error(Value* error_msg, int error_type) asm("_ZN4HPHP12f_user_errorERKNS_6StringEi");
 
-TypedValue * fg1_user_error(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_user_error(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_user_error(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_user_error(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   switch (count) {
   default: // count >= 2
     if ((args-1)->m_type != KindOfInt64) {
@@ -647,40 +430,31 @@ TypedValue * fg1_user_error(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_user_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_user_error(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_user_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_user_error(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_user_error(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_user_error(&args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(k_E_USER_NOTICE))) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("user_error", count, 1, 2, 1);
+      fg1_user_error(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("user_error", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_error.ext_hhvm.h

@@ -16,157 +16,34 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Array HPHP::f_debug_backtrace(bool)
-_ZN4HPHP17f_debug_backtraceEb
-
-(return value) => rax
-_rv => rdi
-provide_object => rsi
-*/
-
 Value* fh_debug_backtrace(Value* _rv, bool provide_object) asm("_ZN4HPHP17f_debug_backtraceEb");
 
-/*
-void HPHP::f_debug_print_backtrace()
-_ZN4HPHP23f_debug_print_backtraceEv
-
-*/
-
-void fh_debug_print_backtrace() asm("_ZN4HPHP23f_debug_print_backtraceEv");
-
-/*
-HPHP::Array HPHP::f_error_get_last()
-_ZN4HPHP16f_error_get_lastEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_error_get_last(Value* _rv) asm("_ZN4HPHP16f_error_get_lastEv");
-
-/*
-bool HPHP::f_error_log(HPHP::String const&, int, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_error_logERKNS_6StringEiS2_S2_
-
-(return value) => rax
-message => rdi
-message_type => rsi
-destination => rdx
-extra_headers => rcx
-*/
-
-bool fh_error_log(Value* message, int message_type, Value* destination, Value* extra_headers) asm("_ZN4HPHP11f_error_logERKNS_6StringEiS2_S2_");
-
-/*
-long HPHP::f_error_reporting(HPHP::Variant const&)
-_ZN4HPHP17f_error_reportingERKNS_7VariantE
-
-(return value) => rax
-level => rdi
-*/
-
-long fh_error_reporting(TypedValue* level) asm("_ZN4HPHP17f_error_reportingERKNS_7VariantE");
-
-/*
-bool HPHP::f_restore_error_handler()
-_ZN4HPHP23f_restore_error_handlerEv
-
-(return value) => rax
-*/
-
-bool fh_restore_error_handler() asm("_ZN4HPHP23f_restore_error_handlerEv");
-
-/*
-bool HPHP::f_restore_exception_handler()
-_ZN4HPHP27f_restore_exception_handlerEv
-
-(return value) => rax
-*/
-
-bool fh_restore_exception_handler() asm("_ZN4HPHP27f_restore_exception_handlerEv");
-
-/*
-HPHP::Variant HPHP::f_set_error_handler(HPHP::Variant const&, int)
-_ZN4HPHP19f_set_error_handlerERKNS_7VariantEi
-
-(return value) => rax
-_rv => rdi
-error_handler => rsi
-error_types => rdx
-*/
-
-TypedValue* fh_set_error_handler(TypedValue* _rv, TypedValue* error_handler, int error_types) asm("_ZN4HPHP19f_set_error_handlerERKNS_7VariantEi");
-
-/*
-HPHP::Variant HPHP::f_set_exception_handler(HPHP::Variant const&)
-_ZN4HPHP23f_set_exception_handlerERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-exception_handler => rsi
-*/
-
-TypedValue* fh_set_exception_handler(TypedValue* _rv, TypedValue* exception_handler) asm("_ZN4HPHP23f_set_exception_handlerERKNS_7VariantE");
-
-/*
-void HPHP::f_hphp_set_error_page(HPHP::String const&)
-_ZN4HPHP21f_hphp_set_error_pageERKNS_6StringE
-
-page => rdi
-*/
-
-void fh_hphp_set_error_page(Value* page) asm("_ZN4HPHP21f_hphp_set_error_pageERKNS_6StringE");
-
-/*
-void HPHP::f_hphp_throw_fatal_error(HPHP::String const&)
-_ZN4HPHP24f_hphp_throw_fatal_errorERKNS_6StringE
-
-error_msg => rdi
-*/
-
-void fh_hphp_throw_fatal_error(Value* error_msg) asm("_ZN4HPHP24f_hphp_throw_fatal_errorERKNS_6StringE");
-
-/*
-void HPHP::f_hphp_clear_unflushed()
-_ZN4HPHP22f_hphp_clear_unflushedEv
-
-*/
-
-void fh_hphp_clear_unflushed() asm("_ZN4HPHP22f_hphp_clear_unflushedEv");
-
-/*
-HPHP::Array HPHP::f_hphp_debug_caller_info()
-_ZN4HPHP24f_hphp_debug_caller_infoEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_hphp_debug_caller_info(Value* _rv) asm("_ZN4HPHP24f_hphp_debug_caller_infoEv");
 
-/*
-bool HPHP::f_trigger_error(HPHP::String const&, int)
-_ZN4HPHP15f_trigger_errorERKNS_6StringEi
+void fh_debug_print_backtrace() asm("_ZN4HPHP23f_debug_print_backtraceEv");
 
-(return value) => rax
-error_msg => rdi
-error_type => rsi
-*/
+Value* fh_error_get_last(Value* _rv) asm("_ZN4HPHP16f_error_get_lastEv");
+
+bool fh_error_log(Value* message, int message_type, Value* destination, Value* extra_headers) asm("_ZN4HPHP11f_error_logERKNS_6StringEiS2_S2_");
+
+long fh_error_reporting(TypedValue* level) asm("_ZN4HPHP17f_error_reportingERKNS_7VariantE");
+
+bool fh_restore_error_handler() asm("_ZN4HPHP23f_restore_error_handlerEv");
+
+bool fh_restore_exception_handler() asm("_ZN4HPHP27f_restore_exception_handlerEv");
+
+TypedValue* fh_set_error_handler(TypedValue* _rv, TypedValue* error_handler, int error_types) asm("_ZN4HPHP19f_set_error_handlerERKNS_7VariantEi");
+
+TypedValue* fh_set_exception_handler(TypedValue* _rv, TypedValue* exception_handler) asm("_ZN4HPHP23f_set_exception_handlerERKNS_7VariantE");
+
+void fh_hphp_set_error_page(Value* page) asm("_ZN4HPHP21f_hphp_set_error_pageERKNS_6StringE");
+
+void fh_hphp_throw_fatal_error(Value* error_msg) asm("_ZN4HPHP24f_hphp_throw_fatal_errorERKNS_6StringE");
+
+void fh_hphp_clear_unflushed() asm("_ZN4HPHP22f_hphp_clear_unflushedEv");
 
 bool fh_trigger_error(Value* error_msg, int error_type) asm("_ZN4HPHP15f_trigger_errorERKNS_6StringEi");
 
-/*
-bool HPHP::f_user_error(HPHP::String const&, int)
-_ZN4HPHP12f_user_errorERKNS_6StringEi
-
-(return value) => rax
-error_msg => rdi
-error_type => rsi
-*/
-
 bool fh_user_error(Value* error_msg, int error_type) asm("_ZN4HPHP12f_user_errorERKNS_6StringEi");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_fb.ext_hhvm.h

@@ -16,415 +16,76 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_fb_thrift_serialize(HPHP::Variant const&)
-_ZN4HPHP21f_fb_thrift_serializeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-*/
-
 TypedValue* fh_fb_thrift_serialize(TypedValue* _rv, TypedValue* thing) asm("_ZN4HPHP21f_fb_thrift_serializeERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_fb_thrift_unserialize(HPHP::Variant const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&)
-_ZN4HPHP23f_fb_thrift_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-success => rdx
-errcode => rcx
-*/
-
 TypedValue* fh_fb_thrift_unserialize(TypedValue* _rv, TypedValue* thing, TypedValue* success, TypedValue* errcode) asm("_ZN4HPHP23f_fb_thrift_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_");
 
-/*
-HPHP::Variant HPHP::f_fb_serialize(HPHP::Variant const&)
-_ZN4HPHP14f_fb_serializeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-*/
-
 TypedValue* fh_fb_serialize(TypedValue* _rv, TypedValue* thing) asm("_ZN4HPHP14f_fb_serializeERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_fb_unserialize(HPHP::Variant const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&)
-_ZN4HPHP16f_fb_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-success => rdx
-errcode => rcx
-*/
-
 TypedValue* fh_fb_unserialize(TypedValue* _rv, TypedValue* thing, TypedValue* success, TypedValue* errcode) asm("_ZN4HPHP16f_fb_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_");
 
-/*
-HPHP::Variant HPHP::f_fb_compact_serialize(HPHP::Variant const&)
-_ZN4HPHP22f_fb_compact_serializeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-*/
-
 TypedValue* fh_fb_compact_serialize(TypedValue* _rv, TypedValue* thing) asm("_ZN4HPHP22f_fb_compact_serializeERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_fb_compact_unserialize(HPHP::Variant const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&)
-_ZN4HPHP24f_fb_compact_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_
-
-(return value) => rax
-_rv => rdi
-thing => rsi
-success => rdx
-errcode => rcx
-*/
-
 TypedValue* fh_fb_compact_unserialize(TypedValue* _rv, TypedValue* thing, TypedValue* success, TypedValue* errcode) asm("_ZN4HPHP24f_fb_compact_unserializeERKNS_7VariantERKNS_14VRefParamValueES5_");
 
-/*
-bool HPHP::f_fb_could_include(HPHP::String const&)
-_ZN4HPHP18f_fb_could_includeERKNS_6StringE
-
-(return value) => rax
-file => rdi
-*/
-
-bool fh_fb_could_include(Value* file) asm("_ZN4HPHP18f_fb_could_includeERKNS_6StringE");
-
-/*
-bool HPHP::f_fb_intercept(HPHP::String const&, HPHP::Variant const&, HPHP::Variant const&)
-_ZN4HPHP14f_fb_interceptERKNS_6StringERKNS_7VariantES5_
-
-(return value) => rax
-name => rdi
-handler => rsi
-data => rdx
-*/
-
-bool fh_fb_intercept(Value* name, TypedValue* handler, TypedValue* data) asm("_ZN4HPHP14f_fb_interceptERKNS_6StringERKNS_7VariantES5_");
-
-/*
-HPHP::Variant HPHP::f_fb_stubout_intercept_handler(HPHP::String const&, HPHP::Variant const&, HPHP::Array const&, HPHP::Variant const&, HPHP::VRefParamValue const&)
-_ZN4HPHP30f_fb_stubout_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-name => rsi
-obj => rdx
-params => rcx
-data => r8
-done => r9
-*/
-
-TypedValue* fh_fb_stubout_intercept_handler(TypedValue* _rv, Value* name, TypedValue* obj, Value* params, TypedValue* data, TypedValue* done) asm("_ZN4HPHP30f_fb_stubout_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE");
-
-/*
-HPHP::Variant HPHP::f_fb_rpc_intercept_handler(HPHP::String const&, HPHP::Variant const&, HPHP::Array const&, HPHP::Variant const&, HPHP::VRefParamValue const&)
-_ZN4HPHP26f_fb_rpc_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-name => rsi
-obj => rdx
-params => rcx
-data => r8
-done => r9
-*/
-
-TypedValue* fh_fb_rpc_intercept_handler(TypedValue* _rv, Value* name, TypedValue* obj, Value* params, TypedValue* data, TypedValue* done) asm("_ZN4HPHP26f_fb_rpc_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE");
-
-/*
-void HPHP::f_fb_renamed_functions(HPHP::Array const&)
-_ZN4HPHP22f_fb_renamed_functionsERKNS_5ArrayE
-
-names => rdi
-*/
-
-void fh_fb_renamed_functions(Value* names) asm("_ZN4HPHP22f_fb_renamed_functionsERKNS_5ArrayE");
-
-/*
-bool HPHP::f_fb_rename_function(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP20f_fb_rename_functionERKNS_6StringES2_
-
-(return value) => rax
-orig_func_name => rdi
-new_func_name => rsi
-*/
-
-bool fh_fb_rename_function(Value* orig_func_name, Value* new_func_name) asm("_ZN4HPHP20f_fb_rename_functionERKNS_6StringES2_");
-
-/*
-bool HPHP::f_fb_autoload_map(HPHP::Variant const&, HPHP::String const&)
-_ZN4HPHP17f_fb_autoload_mapERKNS_7VariantERKNS_6StringE
-
-(return value) => rax
-map => rdi
-root => rsi
-*/
-
-bool fh_fb_autoload_map(TypedValue* map, Value* root) asm("_ZN4HPHP17f_fb_autoload_mapERKNS_7VariantERKNS_6StringE");
-
-/*
-bool HPHP::f_fb_utf8ize(HPHP::VRefParamValue const&)
-_ZN4HPHP12f_fb_utf8izeERKNS_14VRefParamValueE
-
-(return value) => rax
-input => rdi
-*/
-
-bool fh_fb_utf8ize(TypedValue* input) asm("_ZN4HPHP12f_fb_utf8izeERKNS_14VRefParamValueE");
-
-/*
-long HPHP::f_fb_utf8_strlen_deprecated(HPHP::String const&)
-_ZN4HPHP27f_fb_utf8_strlen_deprecatedERKNS_6StringE
-
-(return value) => rax
-input => rdi
-*/
-
-long fh_fb_utf8_strlen_deprecated(Value* input) asm("_ZN4HPHP27f_fb_utf8_strlen_deprecatedERKNS_6StringE");
-
-/*
-long HPHP::f_fb_utf8_strlen(HPHP::String const&)
-_ZN4HPHP16f_fb_utf8_strlenERKNS_6StringE
-
-(return value) => rax
-input => rdi
-*/
-
-long fh_fb_utf8_strlen(Value* input) asm("_ZN4HPHP16f_fb_utf8_strlenERKNS_6StringE");
-
-/*
-HPHP::Variant HPHP::f_fb_utf8_substr(HPHP::String const&, int, int)
-_ZN4HPHP16f_fb_utf8_substrERKNS_6StringEii
-
-(return value) => rax
-_rv => rdi
-str => rsi
-start => rdx
-length => rcx
-*/
-
-TypedValue* fh_fb_utf8_substr(TypedValue* _rv, Value* str, int start, int length) asm("_ZN4HPHP16f_fb_utf8_substrERKNS_6StringEii");
-
-/*
-HPHP::Array HPHP::f_fb_call_user_func_safe(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP24f_fb_call_user_func_safeEiRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-function => rdx
-_argv => rcx
-*/
-
-Value* fh_fb_call_user_func_safe(Value* _rv, int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP24f_fb_call_user_func_safeEiRKNS_7VariantERKNS_5ArrayE");
-
-/*
-HPHP::Variant HPHP::f_fb_call_user_func_safe_return(int, HPHP::Variant const&, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP31f_fb_call_user_func_safe_returnEiRKNS_7VariantES2_RKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-function => rdx
-def => rcx
-_argv => r8
-*/
-
-TypedValue* fh_fb_call_user_func_safe_return(TypedValue* _rv, int64_t _argc, TypedValue* function, TypedValue* def, Value* _argv) asm("_ZN4HPHP31f_fb_call_user_func_safe_returnEiRKNS_7VariantES2_RKNS_5ArrayE");
-
-/*
-HPHP::Array HPHP::f_fb_call_user_func_array_safe(HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP30f_fb_call_user_func_array_safeERKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-function => rsi
-params => rdx
-*/
-
-Value* fh_fb_call_user_func_array_safe(Value* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP30f_fb_call_user_func_array_safeERKNS_7VariantERKNS_5ArrayE");
-
-/*
-HPHP::Variant HPHP::f_fb_get_code_coverage(bool)
-_ZN4HPHP22f_fb_get_code_coverageEb
-
-(return value) => rax
-_rv => rdi
-flush => rsi
-*/
-
-TypedValue* fh_fb_get_code_coverage(TypedValue* _rv, bool flush) asm("_ZN4HPHP22f_fb_get_code_coverageEb");
-
-/*
-void HPHP::f_fb_enable_code_coverage()
-_ZN4HPHP25f_fb_enable_code_coverageEv
-
-*/
-
-void fh_fb_enable_code_coverage() asm("_ZN4HPHP25f_fb_enable_code_coverageEv");
-
-/*
-HPHP::Variant HPHP::f_fb_disable_code_coverage()
-_ZN4HPHP26f_fb_disable_code_coverageEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-TypedValue* fh_fb_disable_code_coverage(TypedValue* _rv) asm("_ZN4HPHP26f_fb_disable_code_coverageEv");
-
-/*
-void HPHP::f_fb_load_local_databases(HPHP::Array const&)
-_ZN4HPHP25f_fb_load_local_databasesERKNS_5ArrayE
-
-servers => rdi
-*/
-
 void fh_fb_load_local_databases(Value* servers) asm("_ZN4HPHP25f_fb_load_local_databasesERKNS_5ArrayE");
 
-/*
-HPHP::Array HPHP::f_fb_parallel_query(HPHP::Array const&, int, bool, bool, int, int, bool)
-_ZN4HPHP19f_fb_parallel_queryERKNS_5ArrayEibbiib
-
-(return value) => rax
-_rv => rdi
-sql_map => rsi
-max_thread => rdx
-combine_result => rcx
-retry_query_on_fail => r8
-connect_timeout => r9
-read_timeout => st0
-timeout_in_ms => st8
-*/
-
 Value* fh_fb_parallel_query(Value* _rv, Value* sql_map, int max_thread, bool combine_result, bool retry_query_on_fail, int connect_timeout, int read_timeout, bool timeout_in_ms) asm("_ZN4HPHP19f_fb_parallel_queryERKNS_5ArrayEibbiib");
 
-/*
-HPHP::Array HPHP::f_fb_crossall_query(HPHP::String const&, int, bool, int, int, bool)
-_ZN4HPHP19f_fb_crossall_queryERKNS_6StringEibiib
-
-(return value) => rax
-_rv => rdi
-sql => rsi
-max_thread => rdx
-retry_query_on_fail => rcx
-connect_timeout => r8
-read_timeout => r9
-timeout_in_ms => st0
-*/
-
 Value* fh_fb_crossall_query(Value* _rv, Value* sql, int max_thread, bool retry_query_on_fail, int connect_timeout, int read_timeout, bool timeout_in_ms) asm("_ZN4HPHP19f_fb_crossall_queryERKNS_6StringEibiib");
 
-/*
-HPHP::Variant HPHP::f_fb_const_fetch(HPHP::Variant const&)
-_ZN4HPHP16f_fb_const_fetchERKNS_7VariantE
+bool fh_fb_utf8ize(TypedValue* input) asm("_ZN4HPHP12f_fb_utf8izeERKNS_14VRefParamValueE");
 
-(return value) => rax
-_rv => rdi
-key => rsi
-*/
+long fh_fb_utf8_strlen(Value* input) asm("_ZN4HPHP16f_fb_utf8_strlenERKNS_6StringE");
 
-TypedValue* fh_fb_const_fetch(TypedValue* _rv, TypedValue* key) asm("_ZN4HPHP16f_fb_const_fetchERKNS_7VariantE");
+long fh_fb_utf8_strlen_deprecated(Value* input) asm("_ZN4HPHP27f_fb_utf8_strlen_deprecatedERKNS_6StringE");
 
-/*
-bool HPHP::f_fb_output_compression(bool)
-_ZN4HPHP23f_fb_output_compressionEb
+TypedValue* fh_fb_utf8_substr(TypedValue* _rv, Value* str, int start, int length) asm("_ZN4HPHP16f_fb_utf8_substrERKNS_6StringEii");
 
-(return value) => rax
-new_value => rdi
-*/
+bool fh_fb_could_include(Value* file) asm("_ZN4HPHP18f_fb_could_includeERKNS_6StringE");
+
+bool fh_fb_intercept(Value* name, TypedValue* handler, TypedValue* data) asm("_ZN4HPHP14f_fb_interceptERKNS_6StringERKNS_7VariantES5_");
+
+TypedValue* fh_fb_stubout_intercept_handler(TypedValue* _rv, Value* name, TypedValue* obj, Value* params, TypedValue* data, TypedValue* done) asm("_ZN4HPHP30f_fb_stubout_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE");
+
+TypedValue* fh_fb_rpc_intercept_handler(TypedValue* _rv, Value* name, TypedValue* obj, Value* params, TypedValue* data, TypedValue* done) asm("_ZN4HPHP26f_fb_rpc_intercept_handlerERKNS_6StringERKNS_7VariantERKNS_5ArrayES5_RKNS_14VRefParamValueE");
+
+void fh_fb_renamed_functions(Value* names) asm("_ZN4HPHP22f_fb_renamed_functionsERKNS_5ArrayE");
+
+bool fh_fb_rename_function(Value* orig_func_name, Value* new_func_name) asm("_ZN4HPHP20f_fb_rename_functionERKNS_6StringES2_");
+
+bool fh_fb_autoload_map(TypedValue* map, Value* root) asm("_ZN4HPHP17f_fb_autoload_mapERKNS_7VariantERKNS_6StringE");
+
+Value* fh_fb_call_user_func_safe(Value* _rv, int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP24f_fb_call_user_func_safeEiRKNS_7VariantERKNS_5ArrayE");
+
+Value* fh_fb_call_user_func_array_safe(Value* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP30f_fb_call_user_func_array_safeERKNS_7VariantERKNS_5ArrayE");
+
+TypedValue* fh_fb_call_user_func_safe_return(TypedValue* _rv, int64_t _argc, TypedValue* function, TypedValue* def, Value* _argv) asm("_ZN4HPHP31f_fb_call_user_func_safe_returnEiRKNS_7VariantES2_RKNS_5ArrayE");
+
+TypedValue* fh_fb_get_code_coverage(TypedValue* _rv, bool flush) asm("_ZN4HPHP22f_fb_get_code_coverageEb");
+
+void fh_fb_enable_code_coverage() asm("_ZN4HPHP25f_fb_enable_code_coverageEv");
+
+TypedValue* fh_fb_disable_code_coverage(TypedValue* _rv) asm("_ZN4HPHP26f_fb_disable_code_coverageEv");
 
 bool fh_fb_output_compression(bool new_value) asm("_ZN4HPHP23f_fb_output_compressionEb");
 
-/*
-void HPHP::f_fb_set_exit_callback(HPHP::Variant const&)
-_ZN4HPHP22f_fb_set_exit_callbackERKNS_7VariantE
-
-function => rdi
-*/
-
 void fh_fb_set_exit_callback(TypedValue* function) asm("_ZN4HPHP22f_fb_set_exit_callbackERKNS_7VariantE");
 
-/*
-HPHP::Array HPHP::f_fb_get_flush_stat()
-_ZN4HPHP19f_fb_get_flush_statEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_fb_get_flush_stat(Value* _rv) asm("_ZN4HPHP19f_fb_get_flush_statEv");
 
-/*
-long HPHP::f_fb_get_last_flush_size()
-_ZN4HPHP24f_fb_get_last_flush_sizeEv
-
-(return value) => rax
-*/
-
 long fh_fb_get_last_flush_size() asm("_ZN4HPHP24f_fb_get_last_flush_sizeEv");
 
-/*
-HPHP::Variant HPHP::f_fb_lazy_stat(HPHP::String const&)
-_ZN4HPHP14f_fb_lazy_statERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-filename => rsi
-*/
-
 TypedValue* fh_fb_lazy_stat(TypedValue* _rv, Value* filename) asm("_ZN4HPHP14f_fb_lazy_statERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_fb_lazy_lstat(HPHP::String const&)
-_ZN4HPHP15f_fb_lazy_lstatERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-filename => rsi
-*/
-
 TypedValue* fh_fb_lazy_lstat(TypedValue* _rv, Value* filename) asm("_ZN4HPHP15f_fb_lazy_lstatERKNS_6StringE");
 
-/*
-HPHP::String HPHP::f_fb_lazy_realpath(HPHP::String const&)
-_ZN4HPHP18f_fb_lazy_realpathERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-filename => rsi
-*/
-
 Value* fh_fb_lazy_realpath(Value* _rv, Value* filename) asm("_ZN4HPHP18f_fb_lazy_realpathERKNS_6StringE");
 
-/*
-HPHP::String HPHP::f_fb_gc_collect_cycles()
-_ZN4HPHP22f_fb_gc_collect_cyclesEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_fb_gc_collect_cycles(Value* _rv) asm("_ZN4HPHP22f_fb_gc_collect_cyclesEv");
 
-/*
-void HPHP::f_fb_gc_detect_cycles(HPHP::String const&)
-_ZN4HPHP21f_fb_gc_detect_cyclesERKNS_6StringE
-
-filename => rdi
-*/
-
 void fh_fb_gc_detect_cycles(Value* filename) asm("_ZN4HPHP21f_fb_gc_detect_cyclesERKNS_6StringE");
 
+TypedValue* fh_fb_const_fetch(TypedValue* _rv, TypedValue* key) asm("_ZN4HPHP16f_fb_const_fetchERKNS_7VariantE");
 
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_function.ext_hhvm.h

@@ -16,289 +16,52 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Array HPHP::f_get_defined_functions()
-_ZN4HPHP23f_get_defined_functionsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_get_defined_functions(Value* _rv) asm("_ZN4HPHP23f_get_defined_functionsEv");
 
-/*
-bool HPHP::f_function_exists(HPHP::String const&, bool)
-_ZN4HPHP17f_function_existsERKNS_6StringEb
-
-(return value) => rax
-function_name => rdi
-autoload => rsi
-*/
-
 bool fh_function_exists(Value* function_name, bool autoload) asm("_ZN4HPHP17f_function_existsERKNS_6StringEb");
 
-/*
-bool HPHP::f_is_callable(HPHP::Variant const&, bool, HPHP::VRefParamValue const&)
-_ZN4HPHP13f_is_callableERKNS_7VariantEbRKNS_14VRefParamValueE
-
-(return value) => rax
-v => rdi
-syntax => rsi
-name => rdx
-*/
-
 bool fh_is_callable(TypedValue* v, bool syntax, TypedValue* name) asm("_ZN4HPHP13f_is_callableERKNS_7VariantEbRKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_call_user_func_array(HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP22f_call_user_func_arrayERKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-function => rsi
-params => rdx
-*/
-
-TypedValue* fh_call_user_func_array(TypedValue* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP22f_call_user_func_arrayERKNS_7VariantERKNS_5ArrayE");
-
-/*
-HPHP::Variant HPHP::f_call_user_func(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP16f_call_user_funcEiRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-function => rdx
-_argv => rcx
-*/
-
 TypedValue* fh_call_user_func(TypedValue* _rv, int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP16f_call_user_funcEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Object HPHP::f_call_user_func_array_async(HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP28f_call_user_func_array_asyncERKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-function => rsi
-params => rdx
-*/
+TypedValue* fh_call_user_func_array(TypedValue* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP22f_call_user_func_arrayERKNS_7VariantERKNS_5ArrayE");
 
 Value* fh_call_user_func_array_async(Value* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP28f_call_user_func_array_asyncERKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Object HPHP::f_call_user_func_async(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP22f_call_user_func_asyncEiRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-function => rdx
-_argv => rcx
-*/
-
 Value* fh_call_user_func_async(Value* _rv, int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP22f_call_user_func_asyncEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_check_user_func_async(HPHP::Variant const&, int)
-_ZN4HPHP23f_check_user_func_asyncERKNS_7VariantEi
-
-(return value) => rax
-_rv => rdi
-handles => rsi
-timeout => rdx
-*/
-
 TypedValue* fh_check_user_func_async(TypedValue* _rv, TypedValue* handles, int timeout) asm("_ZN4HPHP23f_check_user_func_asyncERKNS_7VariantEi");
 
-/*
-HPHP::Variant HPHP::f_end_user_func_async(HPHP::Object const&, int, HPHP::Variant const&)
-_ZN4HPHP21f_end_user_func_asyncERKNS_6ObjectEiRKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-handle => rsi
-default_strategy => rdx
-additional_strategies => rcx
-*/
-
 TypedValue* fh_end_user_func_async(TypedValue* _rv, Value* handle, int default_strategy, TypedValue* additional_strategies) asm("_ZN4HPHP21f_end_user_func_asyncERKNS_6ObjectEiRKNS_7VariantE");
 
-/*
-HPHP::String HPHP::f_call_user_func_serialized(HPHP::String const&)
-_ZN4HPHP27f_call_user_func_serializedERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-input => rsi
-*/
-
 Value* fh_call_user_func_serialized(Value* _rv, Value* input) asm("_ZN4HPHP27f_call_user_func_serializedERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_call_user_func_array_rpc(HPHP::String const&, int, HPHP::String const&, int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP26f_call_user_func_array_rpcERKNS_6StringEiS2_iRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-host => rsi
-port => rdx
-auth => rcx
-timeout => r8
-function => r9
-params => st0
-*/
-
 TypedValue* fh_call_user_func_array_rpc(TypedValue* _rv, Value* host, int port, Value* auth, int timeout, TypedValue* function, Value* params) asm("_ZN4HPHP26f_call_user_func_array_rpcERKNS_6StringEiS2_iRKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_call_user_func_rpc(int, HPHP::String const&, int, HPHP::String const&, int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP20f_call_user_func_rpcEiRKNS_6StringEiS2_iRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-host => rdx
-port => rcx
-auth => r8
-timeout => r9
-function => st0
-_argv => st8
-*/
-
 TypedValue* fh_call_user_func_rpc(TypedValue* _rv, int64_t _argc, Value* host, int port, Value* auth, int timeout, TypedValue* function, Value* _argv) asm("_ZN4HPHP20f_call_user_func_rpcEiRKNS_6StringEiS2_iRKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_forward_static_call_array(HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP27f_forward_static_call_arrayERKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-function => rsi
-params => rdx
-*/
-
 TypedValue* fh_forward_static_call_array(TypedValue* _rv, TypedValue* function, Value* params) asm("_ZN4HPHP27f_forward_static_call_arrayERKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_forward_static_call(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP21f_forward_static_callEiRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-_argc => rsi
-function => rdx
-_argv => rcx
-*/
-
 TypedValue* fh_forward_static_call(TypedValue* _rv, int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP21f_forward_static_callEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-HPHP::Variant HPHP::f_get_called_class()
-_ZN4HPHP18f_get_called_classEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_get_called_class(TypedValue* _rv) asm("_ZN4HPHP18f_get_called_classEv");
 
-/*
-HPHP::String HPHP::f_create_function(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP17f_create_functionERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-args => rsi
-code => rdx
-*/
-
 Value* fh_create_function(Value* _rv, Value* args, Value* code) asm("_ZN4HPHP17f_create_functionERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_func_get_arg(int)
-_ZN4HPHP14f_func_get_argEi
-
-(return value) => rax
-_rv => rdi
-arg_num => rsi
-*/
-
 TypedValue* fh_func_get_arg(TypedValue* _rv, int arg_num) asm("_ZN4HPHP14f_func_get_argEi");
 
-/*
-HPHP::Variant HPHP::f_func_get_args()
-_ZN4HPHP15f_func_get_argsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_func_get_args(TypedValue* _rv) asm("_ZN4HPHP15f_func_get_argsEv");
 
-/*
-long HPHP::f_func_num_args()
-_ZN4HPHP15f_func_num_argsEv
-
-(return value) => rax
-*/
-
 long fh_func_num_args() asm("_ZN4HPHP15f_func_num_argsEv");
 
-/*
-void HPHP::f_register_postsend_function(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP28f_register_postsend_functionEiRKNS_7VariantERKNS_5ArrayE
-
-_argc => rdi
-function => rsi
-_argv => rdx
-*/
-
 void fh_register_postsend_function(int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP28f_register_postsend_functionEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-void HPHP::f_register_shutdown_function(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP28f_register_shutdown_functionEiRKNS_7VariantERKNS_5ArrayE
-
-_argc => rdi
-function => rsi
-_argv => rdx
-*/
-
 void fh_register_shutdown_function(int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP28f_register_shutdown_functionEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-void HPHP::f_register_cleanup_function(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP27f_register_cleanup_functionEiRKNS_7VariantERKNS_5ArrayE
-
-_argc => rdi
-function => rsi
-_argv => rdx
-*/
-
 void fh_register_cleanup_function(int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP27f_register_cleanup_functionEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-bool HPHP::f_register_tick_function(int, HPHP::Variant const&, HPHP::Array const&)
-_ZN4HPHP24f_register_tick_functionEiRKNS_7VariantERKNS_5ArrayE
-
-(return value) => rax
-_argc => rdi
-function => rsi
-_argv => rdx
-*/
-
 bool fh_register_tick_function(int64_t _argc, TypedValue* function, Value* _argv) asm("_ZN4HPHP24f_register_tick_functionEiRKNS_7VariantERKNS_5ArrayE");
 
-/*
-void HPHP::f_unregister_tick_function(HPHP::Variant const&)
-_ZN4HPHP26f_unregister_tick_functionERKNS_7VariantE
-
-function_name => rdi
-*/
-
 void fh_unregister_tick_function(TypedValue* function_name) asm("_ZN4HPHP26f_unregister_tick_functionERKNS_7VariantE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_hash.ext_hhvm.h

@@ -16,163 +16,30 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_hash(HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP6f_hashERKNS_6StringES2_b
-
-(return value) => rax
-_rv => rdi
-algo => rsi
-data => rdx
-raw_output => rcx
-*/
+Value* fh_hash_algos(Value* _rv) asm("_ZN4HPHP12f_hash_algosEv");
 
 TypedValue* fh_hash(TypedValue* _rv, Value* algo, Value* data, bool raw_output) asm("_ZN4HPHP6f_hashERKNS_6StringES2_b");
 
-/*
-HPHP::Array HPHP::f_hash_algos()
-_ZN4HPHP12f_hash_algosEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-Value* fh_hash_algos(Value* _rv) asm("_ZN4HPHP12f_hash_algosEv");
-
-/*
-HPHP::Variant HPHP::f_hash_init(HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP11f_hash_initERKNS_6StringEiS2_
-
-(return value) => rax
-_rv => rdi
-algo => rsi
-options => rdx
-key => rcx
-*/
-
-TypedValue* fh_hash_init(TypedValue* _rv, Value* algo, int options, Value* key) asm("_ZN4HPHP11f_hash_initERKNS_6StringEiS2_");
-
-/*
-HPHP::Variant HPHP::f_hash_file(HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP11f_hash_fileERKNS_6StringES2_b
-
-(return value) => rax
-_rv => rdi
-algo => rsi
-filename => rdx
-raw_output => rcx
-*/
-
 TypedValue* fh_hash_file(TypedValue* _rv, Value* algo, Value* filename, bool raw_output) asm("_ZN4HPHP11f_hash_fileERKNS_6StringES2_b");
 
-/*
-HPHP::String HPHP::f_hash_final(HPHP::Object const&, bool)
-_ZN4HPHP12f_hash_finalERKNS_6ObjectEb
-
-(return value) => rax
-_rv => rdi
-context => rsi
-raw_output => rdx
-*/
-
-Value* fh_hash_final(Value* _rv, Value* context, bool raw_output) asm("_ZN4HPHP12f_hash_finalERKNS_6ObjectEb");
-
-/*
-HPHP::Variant HPHP::f_hash_hmac_file(HPHP::String const&, HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP16f_hash_hmac_fileERKNS_6StringES2_S2_b
-
-(return value) => rax
-_rv => rdi
-algo => rsi
-filename => rdx
-key => rcx
-raw_output => r8
-*/
-
-TypedValue* fh_hash_hmac_file(TypedValue* _rv, Value* algo, Value* filename, Value* key, bool raw_output) asm("_ZN4HPHP16f_hash_hmac_fileERKNS_6StringES2_S2_b");
-
-/*
-HPHP::Variant HPHP::f_hash_hmac(HPHP::String const&, HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP11f_hash_hmacERKNS_6StringES2_S2_b
-
-(return value) => rax
-_rv => rdi
-algo => rsi
-data => rdx
-key => rcx
-raw_output => r8
-*/
-
 TypedValue* fh_hash_hmac(TypedValue* _rv, Value* algo, Value* data, Value* key, bool raw_output) asm("_ZN4HPHP11f_hash_hmacERKNS_6StringES2_S2_b");
 
-/*
-bool HPHP::f_hash_update_file(HPHP::Object const&, HPHP::String const&, HPHP::Object const&)
-_ZN4HPHP18f_hash_update_fileERKNS_6ObjectERKNS_6StringES2_
+TypedValue* fh_hash_hmac_file(TypedValue* _rv, Value* algo, Value* filename, Value* key, bool raw_output) asm("_ZN4HPHP16f_hash_hmac_fileERKNS_6StringES2_S2_b");
 
-(return value) => rax
-init_context => rdi
-filename => rsi
-stream_context => rdx
-*/
-
-bool fh_hash_update_file(Value* init_context, Value* filename, Value* stream_context) asm("_ZN4HPHP18f_hash_update_fileERKNS_6ObjectERKNS_6StringES2_");
-
-/*
-long HPHP::f_hash_update_stream(HPHP::Object const&, HPHP::Object const&, int)
-_ZN4HPHP20f_hash_update_streamERKNS_6ObjectES2_i
-
-(return value) => rax
-context => rdi
-handle => rsi
-length => rdx
-*/
-
-long fh_hash_update_stream(Value* context, Value* handle, int length) asm("_ZN4HPHP20f_hash_update_streamERKNS_6ObjectES2_i");
-
-/*
-bool HPHP::f_hash_update(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP13f_hash_updateERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-context => rdi
-data => rsi
-*/
+TypedValue* fh_hash_init(TypedValue* _rv, Value* algo, int options, Value* key) asm("_ZN4HPHP11f_hash_initERKNS_6StringEiS2_");
 
 bool fh_hash_update(Value* context, Value* data) asm("_ZN4HPHP13f_hash_updateERKNS_6ObjectERKNS_6StringE");
 
-/*
-long HPHP::f_furchash_hphp_ext(HPHP::String const&, int, int)
-_ZN4HPHP19f_furchash_hphp_extERKNS_6StringEii
+bool fh_hash_update_file(Value* init_context, Value* filename, Value* stream_context) asm("_ZN4HPHP18f_hash_update_fileERKNS_6ObjectERKNS_6StringES2_");
 
-(return value) => rax
-key => rdi
-len => rsi
-nPart => rdx
-*/
+long fh_hash_update_stream(Value* context, Value* handle, int length) asm("_ZN4HPHP20f_hash_update_streamERKNS_6ObjectES2_i");
+
+Value* fh_hash_final(Value* _rv, Value* context, bool raw_output) asm("_ZN4HPHP12f_hash_finalERKNS_6ObjectEb");
 
 long fh_furchash_hphp_ext(Value* key, int len, int nPart) asm("_ZN4HPHP19f_furchash_hphp_extERKNS_6StringEii");
 
-/*
-bool HPHP::f_furchash_hphp_ext_supported()
-_ZN4HPHP29f_furchash_hphp_ext_supportedEv
-
-(return value) => rax
-*/
-
 bool fh_furchash_hphp_ext_supported() asm("_ZN4HPHP29f_furchash_hphp_ext_supportedEv");
 
-/*
-long HPHP::f_hphp_murmurhash(HPHP::String const&, int, int)
-_ZN4HPHP17f_hphp_murmurhashERKNS_6StringEii
-
-(return value) => rax
-key => rdi
-len => rsi
-seed => rdx
-*/
-
 long fh_hphp_murmurhash(Value* key, int len, int seed) asm("_ZN4HPHP17f_hphp_murmurhashERKNS_6StringEii");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_hotprofiler.ext_hhvm.cpp

@@ -14,31 +14,94 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-void HPHP::f_xhprof_enable(int, HPHP::Array const&)
-_ZN4HPHP15f_xhprof_enableEiRKNS_5ArrayE
+void fh_fb_setprofile(TypedValue* callback) asm("_ZN4HPHP15f_fb_setprofileERKNS_7VariantE");
 
-flags => rdi
-args => rsi
-*/
+TypedValue* fg_fb_setprofile(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    rv->m_type = KindOfNull;
+    fh_fb_setprofile((args-0));
+  } else {
+    throw_wrong_arguments_nr("fb_setprofile", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
+
+void fh_xhprof_frame_begin(Value* name) asm("_ZN4HPHP20f_xhprof_frame_beginERKNS_6StringE");
+
+void fg1_xhprof_frame_begin(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_xhprof_frame_begin(TypedValue* rv, ActRec* ar, int32_t count) {
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
+  fh_xhprof_frame_begin(&args[-0].m_data);
+}
+
+TypedValue* fg_xhprof_frame_begin(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfNull;
+      fh_xhprof_frame_begin(&args[-0].m_data);
+    } else {
+      fg1_xhprof_frame_begin(rv, ar, count);
+    }
+  } else {
+    throw_wrong_arguments_nr("xhprof_frame_begin", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
+
+void fh_xhprof_frame_end() asm("_ZN4HPHP18f_xhprof_frame_endEv");
+
+TypedValue* fg_xhprof_frame_end(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_xhprof_frame_end();
+  } else {
+    throw_toomany_arguments_nr("xhprof_frame_end", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
 
 void fh_xhprof_enable(int flags, Value* args) asm("_ZN4HPHP15f_xhprof_enableEiRKNS_5ArrayE");
 
-TypedValue * fg1_xhprof_enable(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_xhprof_enable(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_xhprof_enable(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_xhprof_enable(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   switch (count) {
   default: // count >= 2
     if ((args-1)->m_type != KindOfArray) {
@@ -51,235 +114,137 @@ TypedValue * fg1_xhprof_enable(TypedValue* rv, ActRec* ar, int64_t count) {
   case 0:
     break;
   }
+  rv->m_type = KindOfNull;
   fh_xhprof_enable((count > 0) ? (int)(args[-0].m_data.num) : (int)(0), (count > 1) ? &args[-1].m_data : (Value*)(&null_array));
-  return rv;
 }
 
-TypedValue* fg_xhprof_enable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count <= 2LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfArray) && (count <= 0 || (args-0)->m_type == KindOfInt64)) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        fh_xhprof_enable((count > 0) ? (int)(args[-0].m_data.num) : (int)(0), (count > 1) ? &args[-1].m_data : (Value*)(&null_array));
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_xhprof_enable(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_xhprof_enable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count <= 2) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfArray) &&
+        (count <= 0 || (args - 0)->m_type == KindOfInt64)) {
+      rv->m_type = KindOfNull;
+      fh_xhprof_enable((count > 0) ? (int)(args[-0].m_data.num) : (int)(0), (count > 1) ? &args[-1].m_data : (Value*)(&null_array));
     } else {
-      throw_toomany_arguments_nr("xhprof_enable", 2, 1);
+      fg1_xhprof_enable(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_toomany_arguments_nr("xhprof_enable", 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_xhprof_disable()
-_ZN4HPHP16f_xhprof_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_xhprof_disable(TypedValue* _rv) asm("_ZN4HPHP16f_xhprof_disableEv");
 
-TypedValue* fg_xhprof_disable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_xhprof_disable((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_disable", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_xhprof_disable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    fh_xhprof_disable(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("xhprof_disable", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_xhprof_network_enable()
-_ZN4HPHP23f_xhprof_network_enableEv
-
-*/
-
 void fh_xhprof_network_enable() asm("_ZN4HPHP23f_xhprof_network_enableEv");
 
-TypedValue* fg_xhprof_network_enable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_xhprof_network_enable();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_network_enable", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_xhprof_network_enable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_xhprof_network_enable();
+  } else {
+    throw_toomany_arguments_nr("xhprof_network_enable", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_xhprof_network_disable()
-_ZN4HPHP24f_xhprof_network_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_xhprof_network_disable(TypedValue* _rv) asm("_ZN4HPHP24f_xhprof_network_disableEv");
 
-TypedValue* fg_xhprof_network_disable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_xhprof_network_disable((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_network_disable", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-/*
-void HPHP::f_xhprof_frame_begin(HPHP::String const&)
-_ZN4HPHP20f_xhprof_frame_beginERKNS_6StringE
-
-name => rdi
-*/
-
-void fh_xhprof_frame_begin(Value* name) asm("_ZN4HPHP20f_xhprof_frame_beginERKNS_6StringE");
-
-TypedValue * fg1_xhprof_frame_begin(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_xhprof_frame_begin(TypedValue* rv, ActRec* ar, int64_t count) {
+TypedValue* fg_xhprof_network_disable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
-  tvCastToStringInPlace(args-0);
-  fh_xhprof_frame_begin(&args[-0].m_data);
-  return rv;
-}
-
-TypedValue* fg_xhprof_frame_begin(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        fh_xhprof_frame_begin(&args[-0].m_data);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_xhprof_frame_begin(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
-    } else {
-      throw_wrong_arguments_nr("xhprof_frame_begin", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  if (count == 0) {
+    fh_xhprof_network_disable(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("xhprof_network_disable", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+void fh_xhprof_sample_enable() asm("_ZN4HPHP22f_xhprof_sample_enableEv");
 
-
-/*
-void HPHP::f_xhprof_frame_end()
-_ZN4HPHP18f_xhprof_frame_endEv
-
-*/
-
-void fh_xhprof_frame_end() asm("_ZN4HPHP18f_xhprof_frame_endEv");
-
-TypedValue* fg_xhprof_frame_end(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_xhprof_frame_end();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_frame_end", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_xhprof_sample_enable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    rv->m_type = KindOfNull;
+    fh_xhprof_sample_enable();
+  } else {
+    throw_toomany_arguments_nr("xhprof_sample_enable", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+TypedValue* fh_xhprof_sample_disable(TypedValue* _rv) asm("_ZN4HPHP23f_xhprof_sample_disableEv");
 
-
-/*
-HPHP::Variant HPHP::f_xhprof_run_trace(HPHP::String const&, int)
-_ZN4HPHP18f_xhprof_run_traceERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-packedTrace => rsi
-flags => rdx
-*/
+TypedValue* fg_xhprof_sample_disable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 0) {
+    fh_xhprof_sample_disable(rv);
+    if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
+  } else {
+    throw_toomany_arguments_nr("xhprof_sample_disable", 0, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
+  return &ar->m_r;
+}
 
 TypedValue* fh_xhprof_run_trace(TypedValue* _rv, Value* packedTrace, int flags) asm("_ZN4HPHP18f_xhprof_run_traceERKNS_6StringEi");
 
-TypedValue * fg1_xhprof_run_trace(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_xhprof_run_trace(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_xhprof_run_trace(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_xhprof_run_trace(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   if ((args-1)->m_type != KindOfInt64) {
     tvCastToInt64InPlace(args-1);
@@ -287,139 +252,31 @@ TypedValue * fg1_xhprof_run_trace(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_xhprof_run_trace((rv), &args[-0].m_data, (int)(args[-1].m_data.num));
+  fh_xhprof_run_trace(rv, &args[-0].m_data, (int)(args[-1].m_data.num));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_xhprof_run_trace(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if ((args-1)->m_type == KindOfInt64 && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_xhprof_run_trace((&(rv)), &args[-0].m_data, (int)(args[-1].m_data.num));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_xhprof_run_trace(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_xhprof_run_trace(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if ((args - 1)->m_type == KindOfInt64 &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_xhprof_run_trace(rv, &args[-0].m_data, (int)(args[-1].m_data.num));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("xhprof_run_trace", count, 2, 2, 1);
+      fg1_xhprof_run_trace(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("xhprof_run_trace", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-void HPHP::f_xhprof_sample_enable()
-_ZN4HPHP22f_xhprof_sample_enableEv
-
-*/
-
-void fh_xhprof_sample_enable() asm("_ZN4HPHP22f_xhprof_sample_enableEv");
-
-TypedValue* fg_xhprof_sample_enable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_xhprof_sample_enable();
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_sample_enable", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-/*
-HPHP::Variant HPHP::f_xhprof_sample_disable()
-_ZN4HPHP23f_xhprof_sample_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-TypedValue* fh_xhprof_sample_disable(TypedValue* _rv) asm("_ZN4HPHP23f_xhprof_sample_disableEv");
-
-TypedValue* fg_xhprof_sample_disable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 0LL) {
-      fh_xhprof_sample_disable((&(rv)));
-      if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 0);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_toomany_arguments_nr("xhprof_sample_disable", 0, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-/*
-void HPHP::f_fb_setprofile(HPHP::Variant const&)
-_ZN4HPHP15f_fb_setprofileERKNS_7VariantE
-
-callback => rdi
-*/
-
-void fh_fb_setprofile(TypedValue* callback) asm("_ZN4HPHP15f_fb_setprofileERKNS_7VariantE");
-
-TypedValue* fg_fb_setprofile(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      rv.m_data.num = 0LL;
-      rv.m_type = KindOfNull;
-      fh_fb_setprofile((args-0));
-      frame_free_locals_no_this_inl(ar, 1);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("fb_setprofile", count, 1, 1, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
-  return &ar->m_r;
-}
-
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_hotprofiler.ext_hhvm.h

@@ -16,100 +16,24 @@
 */
 namespace HPHP {
 
-/*
-void HPHP::f_xhprof_enable(int, HPHP::Array const&)
-_ZN4HPHP15f_xhprof_enableEiRKNS_5ArrayE
-
-flags => rdi
-args => rsi
-*/
-
-void fh_xhprof_enable(int flags, Value* args) asm("_ZN4HPHP15f_xhprof_enableEiRKNS_5ArrayE");
-
-/*
-HPHP::Variant HPHP::f_xhprof_disable()
-_ZN4HPHP16f_xhprof_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-TypedValue* fh_xhprof_disable(TypedValue* _rv) asm("_ZN4HPHP16f_xhprof_disableEv");
-
-/*
-void HPHP::f_xhprof_network_enable()
-_ZN4HPHP23f_xhprof_network_enableEv
-
-*/
-
-void fh_xhprof_network_enable() asm("_ZN4HPHP23f_xhprof_network_enableEv");
-
-/*
-HPHP::Variant HPHP::f_xhprof_network_disable()
-_ZN4HPHP24f_xhprof_network_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
-TypedValue* fh_xhprof_network_disable(TypedValue* _rv) asm("_ZN4HPHP24f_xhprof_network_disableEv");
-
-/*
-void HPHP::f_xhprof_frame_begin(HPHP::String const&)
-_ZN4HPHP20f_xhprof_frame_beginERKNS_6StringE
-
-name => rdi
-*/
+void fh_fb_setprofile(TypedValue* callback) asm("_ZN4HPHP15f_fb_setprofileERKNS_7VariantE");
 
 void fh_xhprof_frame_begin(Value* name) asm("_ZN4HPHP20f_xhprof_frame_beginERKNS_6StringE");
 
-/*
-void HPHP::f_xhprof_frame_end()
-_ZN4HPHP18f_xhprof_frame_endEv
-
-*/
-
 void fh_xhprof_frame_end() asm("_ZN4HPHP18f_xhprof_frame_endEv");
 
-/*
-HPHP::Variant HPHP::f_xhprof_run_trace(HPHP::String const&, int)
-_ZN4HPHP18f_xhprof_run_traceERKNS_6StringEi
+void fh_xhprof_enable(int flags, Value* args) asm("_ZN4HPHP15f_xhprof_enableEiRKNS_5ArrayE");
 
-(return value) => rax
-_rv => rdi
-packedTrace => rsi
-flags => rdx
-*/
+TypedValue* fh_xhprof_disable(TypedValue* _rv) asm("_ZN4HPHP16f_xhprof_disableEv");
 
-TypedValue* fh_xhprof_run_trace(TypedValue* _rv, Value* packedTrace, int flags) asm("_ZN4HPHP18f_xhprof_run_traceERKNS_6StringEi");
+void fh_xhprof_network_enable() asm("_ZN4HPHP23f_xhprof_network_enableEv");
 
-/*
-void HPHP::f_xhprof_sample_enable()
-_ZN4HPHP22f_xhprof_sample_enableEv
-
-*/
+TypedValue* fh_xhprof_network_disable(TypedValue* _rv) asm("_ZN4HPHP24f_xhprof_network_disableEv");
 
 void fh_xhprof_sample_enable() asm("_ZN4HPHP22f_xhprof_sample_enableEv");
 
-/*
-HPHP::Variant HPHP::f_xhprof_sample_disable()
-_ZN4HPHP23f_xhprof_sample_disableEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_xhprof_sample_disable(TypedValue* _rv) asm("_ZN4HPHP23f_xhprof_sample_disableEv");
 
-/*
-void HPHP::f_fb_setprofile(HPHP::Variant const&)
-_ZN4HPHP15f_fb_setprofileERKNS_7VariantE
-
-callback => rdi
-*/
-
-void fh_fb_setprofile(TypedValue* callback) asm("_ZN4HPHP15f_fb_setprofileERKNS_7VariantE");
-
-
-} // !HPHP
+TypedValue* fh_xhprof_run_trace(TypedValue* _rv, Value* packedTrace, int flags) asm("_ZN4HPHP18f_xhprof_run_traceERKNS_6StringEi");
 
+} // namespace HPHP

hphp/runtime/ext/ext_iconv.ext_hhvm.cpp

@@ -14,31 +14,21 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_iconv_mime_encode(HPHP::String const&, HPHP::String const&, HPHP::Variant const&)
-_ZN4HPHP19f_iconv_mime_encodeERKNS_6StringES2_RKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-field_name => rsi
-field_value => rdx
-preferences => rcx
-*/
-
 TypedValue* fh_iconv_mime_encode(TypedValue* _rv, Value* field_name, Value* field_value, TypedValue* preferences) asm("_ZN4HPHP19f_iconv_mime_encodeERKNS_6StringES2_RKNS_7VariantE");
 
-TypedValue * fg1_iconv_mime_encode(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_mime_encode(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_mime_encode(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_mime_encode(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -51,56 +41,37 @@ TypedValue * fg1_iconv_mime_encode(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_mime_encode((rv), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&null_variant));
+  fh_iconv_mime_encode(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&null_variant));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_mime_encode(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if (IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_mime_encode((&(rv)), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&null_variant));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_mime_encode(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_mime_encode(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if (IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_mime_encode(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&null_variant));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_mime_encode", count, 2, 3, 1);
+      fg1_iconv_mime_encode(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_mime_encode", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_mime_decode(HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP19f_iconv_mime_decodeERKNS_6StringEiS2_
-
-(return value) => rax
-_rv => rdi
-encoded_string => rsi
-mode => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_mime_decode(TypedValue* _rv, Value* encoded_string, int mode, Value* charset) asm("_ZN4HPHP19f_iconv_mime_decodeERKNS_6StringEiS2_");
 
-TypedValue * fg1_iconv_mime_decode(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_mime_decode(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_mime_decode(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_mime_decode(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -117,56 +88,38 @@ TypedValue * fg1_iconv_mime_decode(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_mime_decode((rv), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+  fh_iconv_mime_decode(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_mime_decode(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 3LL) {
-      if ((count <= 2 || IS_STRING_TYPE((args-2)->m_type)) && (count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_mime_decode((&(rv)), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_mime_decode(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_mime_decode(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 3) {
+    if ((count <= 2 || IS_STRING_TYPE((args - 2)->m_type)) &&
+        (count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_mime_decode(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_mime_decode", count, 1, 3, 1);
+      fg1_iconv_mime_decode(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_mime_decode", count, 1, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_mime_decode_headers(HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP27f_iconv_mime_decode_headersERKNS_6StringEiS2_
-
-(return value) => rax
-_rv => rdi
-encoded_headers => rsi
-mode => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_mime_decode_headers(TypedValue* _rv, Value* encoded_headers, int mode, Value* charset) asm("_ZN4HPHP27f_iconv_mime_decode_headersERKNS_6StringEiS2_");
 
-TypedValue * fg1_iconv_mime_decode_headers(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_mime_decode_headers(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_mime_decode_headers(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_mime_decode_headers(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -183,163 +136,110 @@ TypedValue * fg1_iconv_mime_decode_headers(TypedValue* rv, ActRec* ar, int64_t c
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_mime_decode_headers((rv), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+  fh_iconv_mime_decode_headers(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_mime_decode_headers(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 3LL) {
-      if ((count <= 2 || IS_STRING_TYPE((args-2)->m_type)) && (count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_mime_decode_headers((&(rv)), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_mime_decode_headers(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_mime_decode_headers(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 3) {
+    if ((count <= 2 || IS_STRING_TYPE((args - 2)->m_type)) &&
+        (count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_mime_decode_headers(rv, &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_mime_decode_headers", count, 1, 3, 1);
+      fg1_iconv_mime_decode_headers(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_mime_decode_headers", count, 1, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_get_encoding(HPHP::String const&)
-_ZN4HPHP20f_iconv_get_encodingERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-type => rsi
-*/
-
 TypedValue* fh_iconv_get_encoding(TypedValue* _rv, Value* type) asm("_ZN4HPHP20f_iconv_get_encodingERKNS_6StringE");
 
-TypedValue * fg1_iconv_get_encoding(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_get_encoding(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_get_encoding(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_get_encoding(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   tvCastToStringInPlace(args-0);
   String defVal0 = "all";
-  fh_iconv_get_encoding((rv), (count > 0) ? &args[-0].m_data : (Value*)(&defVal0));
+  fh_iconv_get_encoding(rv, (count > 0) ? &args[-0].m_data : (Value*)(&defVal0));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_get_encoding(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count <= 1LL) {
-      if ((count <= 0 || IS_STRING_TYPE((args-0)->m_type))) {
-        String defVal0 = "all";
-        fh_iconv_get_encoding((&(rv)), (count > 0) ? &args[-0].m_data : (Value*)(&defVal0));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_get_encoding(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_get_encoding(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count <= 1) {
+    if ((count <= 0 || IS_STRING_TYPE((args - 0)->m_type))) {
+      String defVal0 = "all";
+      fh_iconv_get_encoding(rv, (count > 0) ? &args[-0].m_data : (Value*)(&defVal0));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_toomany_arguments_nr("iconv_get_encoding", 1, 1);
+      fg1_iconv_get_encoding(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_toomany_arguments_nr("iconv_get_encoding", 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-bool HPHP::f_iconv_set_encoding(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP20f_iconv_set_encodingERKNS_6StringES2_
-
-(return value) => rax
-type => rdi
-charset => rsi
-*/
-
 bool fh_iconv_set_encoding(Value* type, Value* charset) asm("_ZN4HPHP20f_iconv_set_encodingERKNS_6StringES2_");
 
-TypedValue * fg1_iconv_set_encoding(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_set_encoding(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_set_encoding(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_set_encoding(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   if (!IS_STRING_TYPE((args-1)->m_type)) {
     tvCastToStringInPlace(args-1);
   }
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   rv->m_data.num = (fh_iconv_set_encoding(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* fg_iconv_set_encoding(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if (IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (fh_iconv_set_encoding(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_set_encoding(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_set_encoding(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if (IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (fh_iconv_set_encoding(&args[-0].m_data, &args[-1].m_data)) ? 1LL : 0LL;
     } else {
-      throw_wrong_arguments_nr("iconv_set_encoding", count, 2, 2, 1);
+      fg1_iconv_set_encoding(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_set_encoding", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP7f_iconvERKNS_6StringES2_S2_
-
-(return value) => rax
-_rv => rdi
-in_charset => rsi
-out_charset => rdx
-str => rcx
-*/
-
 TypedValue* fh_iconv(TypedValue* _rv, Value* in_charset, Value* out_charset, Value* str) asm("_ZN4HPHP7f_iconvERKNS_6StringES2_S2_");
 
-TypedValue * fg1_iconv(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   if (!IS_STRING_TYPE((args-2)->m_type)) {
     tvCastToStringInPlace(args-2);
@@ -350,55 +250,38 @@ TypedValue * fg1_iconv(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv((rv), &args[-0].m_data, &args[-1].m_data, &args[-2].m_data);
+  fh_iconv(rv, &args[-0].m_data, &args[-1].m_data, &args[-2].m_data);
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 3LL) {
-      if (IS_STRING_TYPE((args-2)->m_type) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv((&(rv)), &args[-0].m_data, &args[-1].m_data, &args[-2].m_data);
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 3) {
+    if (IS_STRING_TYPE((args - 2)->m_type) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv(rv, &args[-0].m_data, &args[-1].m_data, &args[-2].m_data);
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv", count, 3, 3, 1);
+      fg1_iconv(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv", count, 3, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_strlen(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP14f_iconv_strlenERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-str => rsi
-charset => rdx
-*/
-
 TypedValue* fh_iconv_strlen(TypedValue* _rv, Value* str, Value* charset) asm("_ZN4HPHP14f_iconv_strlenERKNS_6StringES2_");
 
-TypedValue * fg1_iconv_strlen(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_strlen(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_strlen(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_strlen(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 2
@@ -411,57 +294,37 @@ TypedValue * fg1_iconv_strlen(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_strlen((rv), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+  fh_iconv_strlen(rv, &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_strlen(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      if ((count <= 1 || IS_STRING_TYPE((args-1)->m_type)) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_strlen((&(rv)), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_strlen(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_strlen(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    if ((count <= 1 || IS_STRING_TYPE((args - 1)->m_type)) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_strlen(rv, &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_strlen", count, 1, 2, 1);
+      fg1_iconv_strlen(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_strlen", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_strpos(HPHP::String const&, HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP14f_iconv_strposERKNS_6StringES2_iS2_
-
-(return value) => rax
-_rv => rdi
-haystack => rsi
-needle => rdx
-offset => rcx
-charset => r8
-*/
-
 TypedValue* fh_iconv_strpos(TypedValue* _rv, Value* haystack, Value* needle, int offset, Value* charset) asm("_ZN4HPHP14f_iconv_strposERKNS_6StringES2_iS2_");
 
-TypedValue * fg1_iconv_strpos(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_strpos(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_strpos(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_strpos(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 4
@@ -481,56 +344,39 @@ TypedValue * fg1_iconv_strpos(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_strpos((rv), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
+  fh_iconv_strpos(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_strpos(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 4LL) {
-      if ((count <= 3 || IS_STRING_TYPE((args-3)->m_type)) && (count <= 2 || (args-2)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_strpos((&(rv)), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_strpos(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_strpos(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 4) {
+    if ((count <= 3 || IS_STRING_TYPE((args - 3)->m_type)) &&
+        (count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_strpos(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (int)(args[-2].m_data.num) : (int)(0), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_strpos", count, 2, 4, 1);
+      fg1_iconv_strpos(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_strpos", count, 2, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_strrpos(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP15f_iconv_strrposERKNS_6StringES2_S2_
-
-(return value) => rax
-_rv => rdi
-haystack => rsi
-needle => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_strrpos(TypedValue* _rv, Value* haystack, Value* needle, Value* charset) asm("_ZN4HPHP15f_iconv_strrposERKNS_6StringES2_S2_");
 
-TypedValue * fg1_iconv_strrpos(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_strrpos(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_strrpos(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_strrpos(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -546,57 +392,38 @@ TypedValue * fg1_iconv_strrpos(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_strrpos((rv), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+  fh_iconv_strrpos(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_strrpos(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 3LL) {
-      if ((count <= 2 || IS_STRING_TYPE((args-2)->m_type)) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_strrpos((&(rv)), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_strrpos(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_strrpos(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 3) {
+    if ((count <= 2 || IS_STRING_TYPE((args - 2)->m_type)) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_strrpos(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_strrpos", count, 2, 3, 1);
+      fg1_iconv_strrpos(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_strrpos", count, 2, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_iconv_substr(HPHP::String const&, int, int, HPHP::String const&)
-_ZN4HPHP14f_iconv_substrERKNS_6StringEiiS2_
-
-(return value) => rax
-_rv => rdi
-str => rsi
-offset => rdx
-length => rcx
-charset => r8
-*/
-
 TypedValue* fh_iconv_substr(TypedValue* _rv, Value* str, int offset, int length, Value* charset) asm("_ZN4HPHP14f_iconv_substrERKNS_6StringEiiS2_");
 
-TypedValue * fg1_iconv_substr(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_iconv_substr(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_iconv_substr(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_iconv_substr(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 4
@@ -616,99 +443,73 @@ TypedValue * fg1_iconv_substr(TypedValue* rv, ActRec* ar, int64_t count) {
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_iconv_substr((rv), &args[-0].m_data, (int)(args[-1].m_data.num), (count > 2) ? (int)(args[-2].m_data.num) : (int)(INT_MAX), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
+  fh_iconv_substr(rv, &args[-0].m_data, (int)(args[-1].m_data.num), (count > 2) ? (int)(args[-2].m_data.num) : (int)(INT_MAX), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_iconv_substr(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 4LL) {
-      if ((count <= 3 || IS_STRING_TYPE((args-3)->m_type)) && (count <= 2 || (args-2)->m_type == KindOfInt64) && (args-1)->m_type == KindOfInt64 && IS_STRING_TYPE((args-0)->m_type)) {
-        fh_iconv_substr((&(rv)), &args[-0].m_data, (int)(args[-1].m_data.num), (count > 2) ? (int)(args[-2].m_data.num) : (int)(INT_MAX), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_iconv_substr(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_iconv_substr(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 4) {
+    if ((count <= 3 || IS_STRING_TYPE((args - 3)->m_type)) &&
+        (count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+        (args - 1)->m_type == KindOfInt64 &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      fh_iconv_substr(rv, &args[-0].m_data, (int)(args[-1].m_data.num), (count > 2) ? (int)(args[-2].m_data.num) : (int)(INT_MAX), (count > 3) ? &args[-3].m_data : (Value*)(&null_string));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("iconv_substr", count, 2, 4, 1);
+      fg1_iconv_substr(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("iconv_substr", count, 2, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_ob_iconv_handler(HPHP::String const&, int)
-_ZN4HPHP18f_ob_iconv_handlerERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-contents => rsi
-status => rdx
-*/
-
 Value* fh_ob_iconv_handler(Value* _rv, Value* contents, int status) asm("_ZN4HPHP18f_ob_iconv_handlerERKNS_6StringEi");
 
-TypedValue * fg1_ob_iconv_handler(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_ob_iconv_handler(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_ob_iconv_handler(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_ob_iconv_handler(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   if ((args-1)->m_type != KindOfInt64) {
     tvCastToInt64InPlace(args-1);
   }
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_ob_iconv_handler((&rv->m_data), &args[-0].m_data, (int)(args[-1].m_data.num));
+  rv->m_type = KindOfString;
+  fh_ob_iconv_handler(&(rv->m_data), &args[-0].m_data, (int)(args[-1].m_data.num));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_ob_iconv_handler(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if ((args-1)->m_type == KindOfInt64 && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_ob_iconv_handler((&rv.m_data), &args[-0].m_data, (int)(args[-1].m_data.num));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_ob_iconv_handler(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_ob_iconv_handler(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if ((args - 1)->m_type == KindOfInt64 &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_ob_iconv_handler(&(rv->m_data), &args[-0].m_data, (int)(args[-1].m_data.num));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("ob_iconv_handler", count, 2, 2, 1);
+      fg1_ob_iconv_handler(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("ob_iconv_handler", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_iconv.ext_hhvm.h

@@ -16,145 +16,26 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_iconv_mime_encode(HPHP::String const&, HPHP::String const&, HPHP::Variant const&)
-_ZN4HPHP19f_iconv_mime_encodeERKNS_6StringES2_RKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-field_name => rsi
-field_value => rdx
-preferences => rcx
-*/
-
 TypedValue* fh_iconv_mime_encode(TypedValue* _rv, Value* field_name, Value* field_value, TypedValue* preferences) asm("_ZN4HPHP19f_iconv_mime_encodeERKNS_6StringES2_RKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_iconv_mime_decode(HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP19f_iconv_mime_decodeERKNS_6StringEiS2_
-
-(return value) => rax
-_rv => rdi
-encoded_string => rsi
-mode => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_mime_decode(TypedValue* _rv, Value* encoded_string, int mode, Value* charset) asm("_ZN4HPHP19f_iconv_mime_decodeERKNS_6StringEiS2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_mime_decode_headers(HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP27f_iconv_mime_decode_headersERKNS_6StringEiS2_
-
-(return value) => rax
-_rv => rdi
-encoded_headers => rsi
-mode => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_mime_decode_headers(TypedValue* _rv, Value* encoded_headers, int mode, Value* charset) asm("_ZN4HPHP27f_iconv_mime_decode_headersERKNS_6StringEiS2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_get_encoding(HPHP::String const&)
-_ZN4HPHP20f_iconv_get_encodingERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-type => rsi
-*/
-
 TypedValue* fh_iconv_get_encoding(TypedValue* _rv, Value* type) asm("_ZN4HPHP20f_iconv_get_encodingERKNS_6StringE");
 
-/*
-bool HPHP::f_iconv_set_encoding(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP20f_iconv_set_encodingERKNS_6StringES2_
-
-(return value) => rax
-type => rdi
-charset => rsi
-*/
-
 bool fh_iconv_set_encoding(Value* type, Value* charset) asm("_ZN4HPHP20f_iconv_set_encodingERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_iconv(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP7f_iconvERKNS_6StringES2_S2_
-
-(return value) => rax
-_rv => rdi
-in_charset => rsi
-out_charset => rdx
-str => rcx
-*/
-
 TypedValue* fh_iconv(TypedValue* _rv, Value* in_charset, Value* out_charset, Value* str) asm("_ZN4HPHP7f_iconvERKNS_6StringES2_S2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_strlen(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP14f_iconv_strlenERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-str => rsi
-charset => rdx
-*/
-
 TypedValue* fh_iconv_strlen(TypedValue* _rv, Value* str, Value* charset) asm("_ZN4HPHP14f_iconv_strlenERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_strpos(HPHP::String const&, HPHP::String const&, int, HPHP::String const&)
-_ZN4HPHP14f_iconv_strposERKNS_6StringES2_iS2_
-
-(return value) => rax
-_rv => rdi
-haystack => rsi
-needle => rdx
-offset => rcx
-charset => r8
-*/
-
 TypedValue* fh_iconv_strpos(TypedValue* _rv, Value* haystack, Value* needle, int offset, Value* charset) asm("_ZN4HPHP14f_iconv_strposERKNS_6StringES2_iS2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_strrpos(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP15f_iconv_strrposERKNS_6StringES2_S2_
-
-(return value) => rax
-_rv => rdi
-haystack => rsi
-needle => rdx
-charset => rcx
-*/
-
 TypedValue* fh_iconv_strrpos(TypedValue* _rv, Value* haystack, Value* needle, Value* charset) asm("_ZN4HPHP15f_iconv_strrposERKNS_6StringES2_S2_");
 
-/*
-HPHP::Variant HPHP::f_iconv_substr(HPHP::String const&, int, int, HPHP::String const&)
-_ZN4HPHP14f_iconv_substrERKNS_6StringEiiS2_
-
-(return value) => rax
-_rv => rdi
-str => rsi
-offset => rdx
-length => rcx
-charset => r8
-*/
-
 TypedValue* fh_iconv_substr(TypedValue* _rv, Value* str, int offset, int length, Value* charset) asm("_ZN4HPHP14f_iconv_substrERKNS_6StringEiiS2_");
 
-/*
-HPHP::String HPHP::f_ob_iconv_handler(HPHP::String const&, int)
-_ZN4HPHP18f_ob_iconv_handlerERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-contents => rsi
-status => rdx
-*/
-
 Value* fh_ob_iconv_handler(Value* _rv, Value* contents, int status) asm("_ZN4HPHP18f_ob_iconv_handlerERKNS_6StringEi");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu.ext_hhvm.cpp

@@ -14,32 +14,21 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_icu_match(HPHP::String const&, HPHP::String const&, HPHP::VRefParamValue const&, long)
-_ZN4HPHP11f_icu_matchERKNS_6StringES2_RKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-pattern => rsi
-subject => rdx
-matches => rcx
-flags => r8
-*/
-
 TypedValue* fh_icu_match(TypedValue* _rv, Value* pattern, Value* subject, TypedValue* matches, long flags) asm("_ZN4HPHP11f_icu_matchERKNS_6StringES2_RKNS_14VRefParamValueEl");
 
-TypedValue * fg1_icu_match(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_icu_match(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_icu_match(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_icu_match(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 4
@@ -57,152 +46,107 @@ TypedValue * fg1_icu_match(TypedValue* rv, ActRec* ar, int64_t count) {
     tvCastToStringInPlace(args-0);
   }
   VRefParamValue defVal2 = uninit_null();
-  fh_icu_match((rv), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2), (count > 3) ? (long)(args[-3].m_data.num) : (long)(0));
+  fh_icu_match(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2), (count > 3) ? (long)(args[-3].m_data.num) : (long)(0));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_icu_match(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 2LL && count <= 4LL) {
-      if ((count <= 3 || (args-3)->m_type == KindOfInt64) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-        VRefParamValue defVal2 = uninit_null();
-        fh_icu_match((&(rv)), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2), (count > 3) ? (long)(args[-3].m_data.num) : (long)(0));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_icu_match(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 4);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_icu_match(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 2 && count <= 4) {
+    if ((count <= 3 || (args - 3)->m_type == KindOfInt64) &&
+        IS_STRING_TYPE((args - 1)->m_type) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      VRefParamValue defVal2 = uninit_null();
+      fh_icu_match(rv, &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2), (count > 3) ? (long)(args[-3].m_data.num) : (long)(0));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("icu_match", count, 2, 4, 1);
+      fg1_icu_match(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("icu_match", count, 2, 4, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::String HPHP::f_icu_transliterate(HPHP::String const&, bool)
-_ZN4HPHP19f_icu_transliterateERKNS_6StringEb
-
-(return value) => rax
-_rv => rdi
-str => rsi
-remove_accents => rdx
-*/
-
 Value* fh_icu_transliterate(Value* _rv, Value* str, bool remove_accents) asm("_ZN4HPHP19f_icu_transliterateERKNS_6StringEb");
 
-TypedValue * fg1_icu_transliterate(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_icu_transliterate(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_icu_transliterate(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_icu_transliterate(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   if ((args-1)->m_type != KindOfBoolean) {
     tvCastToBooleanInPlace(args-1);
   }
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  fh_icu_transliterate((&rv->m_data), &args[-0].m_data, (bool)(args[-1].m_data.num));
+  rv->m_type = KindOfString;
+  fh_icu_transliterate(&(rv->m_data), &args[-0].m_data, (bool)(args[-1].m_data.num));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_icu_transliterate(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 2LL) {
-      if ((args-1)->m_type == KindOfBoolean && IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfString;
-        fh_icu_transliterate((&rv.m_data), &args[-0].m_data, (bool)(args[-1].m_data.num));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_icu_transliterate(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 2);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_icu_transliterate(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 2) {
+    if ((args - 1)->m_type == KindOfBoolean &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfString;
+      fh_icu_transliterate(&(rv->m_data), &args[-0].m_data, (bool)(args[-1].m_data.num));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("icu_transliterate", count, 2, 2, 1);
+      fg1_icu_transliterate(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("icu_transliterate", count, 2, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Array HPHP::f_icu_tokenize(HPHP::String const&)
-_ZN4HPHP14f_icu_tokenizeERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-text => rsi
-*/
-
 Value* fh_icu_tokenize(Value* _rv, Value* text) asm("_ZN4HPHP14f_icu_tokenizeERKNS_6StringE");
 
-TypedValue * fg1_icu_tokenize(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_icu_tokenize(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_icu_tokenize(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_icu_tokenize(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfArray;
   tvCastToStringInPlace(args-0);
-  fh_icu_tokenize((&rv->m_data), &args[-0].m_data);
+  rv->m_type = KindOfArray;
+  fh_icu_tokenize(&(rv->m_data), &args[-0].m_data);
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_icu_tokenize(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count == 1LL) {
-      if (IS_STRING_TYPE((args-0)->m_type)) {
-        rv.m_type = KindOfArray;
-        fh_icu_tokenize((&rv.m_data), &args[-0].m_data);
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_icu_tokenize(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_icu_tokenize(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count == 1) {
+    if (IS_STRING_TYPE((args - 0)->m_type)) {
+      rv->m_type = KindOfArray;
+      fh_icu_tokenize(&(rv->m_data), &args[-0].m_data);
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("icu_tokenize", count, 1, 1, 1);
+      fg1_icu_tokenize(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("icu_tokenize", count, 1, 1, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu.ext_hhvm.h

@@ -16,43 +16,10 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_icu_match(HPHP::String const&, HPHP::String const&, HPHP::VRefParamValue const&, long)
-_ZN4HPHP11f_icu_matchERKNS_6StringES2_RKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-pattern => rsi
-subject => rdx
-matches => rcx
-flags => r8
-*/
-
 TypedValue* fh_icu_match(TypedValue* _rv, Value* pattern, Value* subject, TypedValue* matches, long flags) asm("_ZN4HPHP11f_icu_matchERKNS_6StringES2_RKNS_14VRefParamValueEl");
 
-/*
-HPHP::String HPHP::f_icu_transliterate(HPHP::String const&, bool)
-_ZN4HPHP19f_icu_transliterateERKNS_6StringEb
-
-(return value) => rax
-_rv => rdi
-str => rsi
-remove_accents => rdx
-*/
-
 Value* fh_icu_transliterate(Value* _rv, Value* str, bool remove_accents) asm("_ZN4HPHP19f_icu_transliterateERKNS_6StringEb");
 
-/*
-HPHP::Array HPHP::f_icu_tokenize(HPHP::String const&)
-_ZN4HPHP14f_icu_tokenizeERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-text => rsi
-*/
-
 Value* fh_icu_tokenize(Value* _rv, Value* text) asm("_ZN4HPHP14f_icu_tokenizeERKNS_6StringE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu_ucnv.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu_ucsdet.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_EncodingDetector_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_EncodingDetector) - sizeof(ObjectData);
@@ -34,226 +36,158 @@ HPHP::VM::Instance* new_EncodingDetector_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(EncodingDetector);
-/*
-void HPHP::c_EncodingDetector::t___construct()
-_ZN4HPHP18c_EncodingDetector13t___constructEv
-
-this_ => rdi
-*/
-
 void th_16EncodingDetector___construct(ObjectData* this_) asm("_ZN4HPHP18c_EncodingDetector13t___constructEv");
 
-TypedValue* tg_16EncodingDetector___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_16EncodingDetector___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingDetector::__construct", 0, 1);
-      }
+TypedValue* tg_16EncodingDetector___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_16EncodingDetector___construct((this_));
     } else {
-      throw_instance_method_fatal("EncodingDetector::__construct");
+      throw_toomany_arguments_nr("EncodingDetector::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingDetector::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_EncodingDetector::t_settext(HPHP::String const&)
-_ZN4HPHP18c_EncodingDetector9t_settextERKNS_6StringE
-
-this_ => rdi
-text => rsi
-*/
-
 void th_16EncodingDetector_setText(ObjectData* this_, Value* text) asm("_ZN4HPHP18c_EncodingDetector9t_settextERKNS_6StringE");
 
-TypedValue* tg1_16EncodingDetector_setText(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_16EncodingDetector_setText(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_16EncodingDetector_setText(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_16EncodingDetector_setText(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
   th_16EncodingDetector_setText((this_), &args[-0].m_data);
-  return rv;
 }
 
-TypedValue* tg_16EncodingDetector_setText(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 1LL) {
-        if (IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_data.num = 0LL;
-          rv.m_type = KindOfNull;
-          th_16EncodingDetector_setText((this_), &args[-0].m_data);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_16EncodingDetector_setText(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_16EncodingDetector_setText(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 1) {
+      if (IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfNull;
+        th_16EncodingDetector_setText((this_), &args[-0].m_data);
       } else {
-        throw_wrong_arguments_nr("EncodingDetector::setText", count, 1, 1, 1);
+        tg1_16EncodingDetector_setText(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("EncodingDetector::setText");
+      throw_wrong_arguments_nr("EncodingDetector::setText", count, 1, 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingDetector::setText");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_EncodingDetector::t_setdeclaredencoding(HPHP::String const&)
-_ZN4HPHP18c_EncodingDetector21t_setdeclaredencodingERKNS_6StringE
-
-this_ => rdi
-text => rsi
-*/
-
 void th_16EncodingDetector_setDeclaredEncoding(ObjectData* this_, Value* text) asm("_ZN4HPHP18c_EncodingDetector21t_setdeclaredencodingERKNS_6StringE");
 
-TypedValue* tg1_16EncodingDetector_setDeclaredEncoding(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_16EncodingDetector_setDeclaredEncoding(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_16EncodingDetector_setDeclaredEncoding(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_16EncodingDetector_setDeclaredEncoding(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
   th_16EncodingDetector_setDeclaredEncoding((this_), &args[-0].m_data);
-  return rv;
 }
 
-TypedValue* tg_16EncodingDetector_setDeclaredEncoding(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 1LL) {
-        if (IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_data.num = 0LL;
-          rv.m_type = KindOfNull;
-          th_16EncodingDetector_setDeclaredEncoding((this_), &args[-0].m_data);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_16EncodingDetector_setDeclaredEncoding(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_16EncodingDetector_setDeclaredEncoding(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 1) {
+      if (IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfNull;
+        th_16EncodingDetector_setDeclaredEncoding((this_), &args[-0].m_data);
       } else {
-        throw_wrong_arguments_nr("EncodingDetector::setDeclaredEncoding", count, 1, 1, 1);
+        tg1_16EncodingDetector_setDeclaredEncoding(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("EncodingDetector::setDeclaredEncoding");
+      throw_wrong_arguments_nr("EncodingDetector::setDeclaredEncoding", count, 1, 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingDetector::setDeclaredEncoding");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_EncodingDetector::t_detect()
-_ZN4HPHP18c_EncodingDetector8t_detectEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_16EncodingDetector_detect(Value* _rv, ObjectData* this_) asm("_ZN4HPHP18c_EncodingDetector8t_detectEv");
 
-TypedValue* tg_16EncodingDetector_detect(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfObject;
-        th_16EncodingDetector_detect((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingDetector::detect", 0, 1);
-      }
+TypedValue* tg_16EncodingDetector_detect(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfObject;
+      th_16EncodingDetector_detect(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("EncodingDetector::detect");
+      throw_toomany_arguments_nr("EncodingDetector::detect", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingDetector::detect");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Array HPHP::c_EncodingDetector::t_detectall()
-_ZN4HPHP18c_EncodingDetector11t_detectallEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_16EncodingDetector_detectAll(Value* _rv, ObjectData* this_) asm("_ZN4HPHP18c_EncodingDetector11t_detectallEv");
 
-TypedValue* tg_16EncodingDetector_detectAll(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfArray;
-        th_16EncodingDetector_detectAll((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingDetector::detectAll", 0, 1);
-      }
+TypedValue* tg_16EncodingDetector_detectAll(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfArray;
+      th_16EncodingDetector_detectAll(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("EncodingDetector::detectAll");
+      throw_toomany_arguments_nr("EncodingDetector::detectAll", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingDetector::detectAll");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
+
 HPHP::VM::Instance* new_EncodingMatch_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_EncodingMatch) - sizeof(ObjectData);
@@ -264,228 +198,157 @@ HPHP::VM::Instance* new_EncodingMatch_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(EncodingMatch);
-/*
-void HPHP::c_EncodingMatch::t___construct()
-_ZN4HPHP15c_EncodingMatch13t___constructEv
-
-this_ => rdi
-*/
-
 void th_13EncodingMatch___construct(ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch13t___constructEv");
 
-TypedValue* tg_13EncodingMatch___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_13EncodingMatch___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::__construct", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_13EncodingMatch___construct((this_));
     } else {
-      throw_instance_method_fatal("EncodingMatch::__construct");
+      throw_toomany_arguments_nr("EncodingMatch::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_EncodingMatch::t_isvalid()
-_ZN4HPHP15c_EncodingMatch9t_isvalidEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 bool th_13EncodingMatch_isValid(ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch9t_isvalidEv");
 
-TypedValue* tg_13EncodingMatch_isValid(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfBoolean;
-        rv.m_data.num = (th_13EncodingMatch_isValid((this_))) ? 1LL : 0LL;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::isValid", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch_isValid(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfBoolean;
+      rv->m_data.num = (th_13EncodingMatch_isValid((this_))) ? 1LL : 0LL;
     } else {
-      throw_instance_method_fatal("EncodingMatch::isValid");
+      throw_toomany_arguments_nr("EncodingMatch::isValid", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::isValid");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_EncodingMatch::t_getencoding()
-_ZN4HPHP15c_EncodingMatch13t_getencodingEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_13EncodingMatch_getEncoding(Value* _rv, ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch13t_getencodingEv");
 
-TypedValue* tg_13EncodingMatch_getEncoding(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfString;
-        th_13EncodingMatch_getEncoding((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::getEncoding", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch_getEncoding(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfString;
+      th_13EncodingMatch_getEncoding(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("EncodingMatch::getEncoding");
+      throw_toomany_arguments_nr("EncodingMatch::getEncoding", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::getEncoding");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-long HPHP::c_EncodingMatch::t_getconfidence()
-_ZN4HPHP15c_EncodingMatch15t_getconfidenceEv
-
-(return value) => rax
-this_ => rdi
-*/
-
 long th_13EncodingMatch_getConfidence(ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch15t_getconfidenceEv");
 
-TypedValue* tg_13EncodingMatch_getConfidence(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfInt64;
-        rv.m_data.num = (int64_t)th_13EncodingMatch_getConfidence((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::getConfidence", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch_getConfidence(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfInt64;
+      rv->m_data.num = (int64_t)th_13EncodingMatch_getConfidence((this_));
     } else {
-      throw_instance_method_fatal("EncodingMatch::getConfidence");
+      throw_toomany_arguments_nr("EncodingMatch::getConfidence", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::getConfidence");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_EncodingMatch::t_getlanguage()
-_ZN4HPHP15c_EncodingMatch13t_getlanguageEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_13EncodingMatch_getLanguage(Value* _rv, ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch13t_getlanguageEv");
 
-TypedValue* tg_13EncodingMatch_getLanguage(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfString;
-        th_13EncodingMatch_getLanguage((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::getLanguage", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch_getLanguage(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfString;
+      th_13EncodingMatch_getLanguage(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("EncodingMatch::getLanguage");
+      throw_toomany_arguments_nr("EncodingMatch::getLanguage", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::getLanguage");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_EncodingMatch::t_getutf8()
-_ZN4HPHP15c_EncodingMatch9t_getutf8Ev
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_13EncodingMatch_getUTF8(Value* _rv, ObjectData* this_) asm("_ZN4HPHP15c_EncodingMatch9t_getutf8Ev");
 
-TypedValue* tg_13EncodingMatch_getUTF8(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfString;
-        th_13EncodingMatch_getUTF8((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("EncodingMatch::getUTF8", 0, 1);
-      }
+TypedValue* tg_13EncodingMatch_getUTF8(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfString;
+      th_13EncodingMatch_getUTF8(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("EncodingMatch::getUTF8");
+      throw_toomany_arguments_nr("EncodingMatch::getUTF8", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("EncodingMatch::getUTF8");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu_ucsdet.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu_uspoof.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_SpoofChecker_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_SpoofChecker) - sizeof(ObjectData);
@@ -34,115 +36,75 @@ HPHP::VM::Instance* new_SpoofChecker_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(SpoofChecker);
-/*
-void HPHP::c_SpoofChecker::t___construct()
-_ZN4HPHP14c_SpoofChecker13t___constructEv
-
-this_ => rdi
-*/
-
 void th_12SpoofChecker___construct(ObjectData* this_) asm("_ZN4HPHP14c_SpoofChecker13t___constructEv");
 
-TypedValue* tg_12SpoofChecker___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_12SpoofChecker___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("SpoofChecker::__construct", 0, 1);
-      }
+TypedValue* tg_12SpoofChecker___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_12SpoofChecker___construct((this_));
     } else {
-      throw_instance_method_fatal("SpoofChecker::__construct");
+      throw_toomany_arguments_nr("SpoofChecker::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SpoofChecker::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_SpoofChecker::t_issuspicious(HPHP::String const&, HPHP::VRefParamValue const&)
-_ZN4HPHP14c_SpoofChecker14t_issuspiciousERKNS_6StringERKNS_14VRefParamValueE
-
-(return value) => rax
-this_ => rdi
-text => rsi
-issuesFound => rdx
-*/
-
 bool th_12SpoofChecker_isSuspicious(ObjectData* this_, Value* text, TypedValue* issuesFound) asm("_ZN4HPHP14c_SpoofChecker14t_issuspiciousERKNS_6StringERKNS_14VRefParamValueE");
 
-TypedValue* tg1_12SpoofChecker_isSuspicious(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_12SpoofChecker_isSuspicious(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_12SpoofChecker_isSuspicious(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_12SpoofChecker_isSuspicious(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfBoolean;
   VRefParamValue defVal1 = uninit_null();
   rv->m_data.num = (th_12SpoofChecker_isSuspicious((this_), &args[-0].m_data, (count > 1) ? (args-1) : (TypedValue*)(&defVal1))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* tg_12SpoofChecker_isSuspicious(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 1LL && count <= 2LL) {
-        if (IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfBoolean;
-          VRefParamValue defVal1 = uninit_null();
-          rv.m_data.num = (th_12SpoofChecker_isSuspicious((this_), &args[-0].m_data, (count > 1) ? (args-1) : (TypedValue*)(&defVal1))) ? 1LL : 0LL;
-          frame_free_locals_inl(ar, 2);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_12SpoofChecker_isSuspicious(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 2);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_12SpoofChecker_isSuspicious(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 1 && count <= 2) {
+      if (IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfBoolean;
+        VRefParamValue defVal1 = uninit_null();
+        rv->m_data.num = (th_12SpoofChecker_isSuspicious((this_), &args[-0].m_data, (count > 1) ? (args-1) : (TypedValue*)(&defVal1))) ? 1LL : 0LL;
       } else {
-        throw_wrong_arguments_nr("SpoofChecker::isSuspicious", count, 1, 2, 1);
+        tg1_12SpoofChecker_isSuspicious(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("SpoofChecker::isSuspicious");
+      throw_wrong_arguments_nr("SpoofChecker::isSuspicious", count, 1, 2, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SpoofChecker::isSuspicious");
+  }
+  frame_free_locals_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-bool HPHP::c_SpoofChecker::t_areconfusable(HPHP::String const&, HPHP::String const&, HPHP::VRefParamValue const&)
-_ZN4HPHP14c_SpoofChecker15t_areconfusableERKNS_6StringES3_RKNS_14VRefParamValueE
-
-(return value) => rax
-this_ => rdi
-s1 => rsi
-s2 => rdx
-issuesFound => rcx
-*/
-
 bool th_12SpoofChecker_areConfusable(ObjectData* this_, Value* s1, Value* s2, TypedValue* issuesFound) asm("_ZN4HPHP14c_SpoofChecker15t_areconfusableERKNS_6StringES3_RKNS_14VRefParamValueE");
 
-TypedValue* tg1_12SpoofChecker_areConfusable(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_12SpoofChecker_areConfusable(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_12SpoofChecker_areConfusable(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_12SpoofChecker_areConfusable(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfBoolean;
   switch (count) {
   default: // count >= 3
   case 2:
@@ -154,153 +116,112 @@ TypedValue* tg1_12SpoofChecker_areConfusable(TypedValue* rv, ActRec* ar, int64_t
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfBoolean;
   VRefParamValue defVal2 = uninit_null();
   rv->m_data.num = (th_12SpoofChecker_areConfusable((this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2))) ? 1LL : 0LL;
-  return rv;
 }
 
-TypedValue* tg_12SpoofChecker_areConfusable(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 2LL && count <= 3LL) {
-        if (IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfBoolean;
-          VRefParamValue defVal2 = uninit_null();
-          rv.m_data.num = (th_12SpoofChecker_areConfusable((this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2))) ? 1LL : 0LL;
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_12SpoofChecker_areConfusable(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_12SpoofChecker_areConfusable(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 2 && count <= 3) {
+      if (IS_STRING_TYPE((args - 1)->m_type) &&
+          IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfBoolean;
+        VRefParamValue defVal2 = uninit_null();
+        rv->m_data.num = (th_12SpoofChecker_areConfusable((this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? (args-2) : (TypedValue*)(&defVal2))) ? 1LL : 0LL;
       } else {
-        throw_wrong_arguments_nr("SpoofChecker::areConfusable", count, 2, 3, 1);
+        tg1_12SpoofChecker_areConfusable(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("SpoofChecker::areConfusable");
+      throw_wrong_arguments_nr("SpoofChecker::areConfusable", count, 2, 3, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SpoofChecker::areConfusable");
+  }
+  frame_free_locals_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_SpoofChecker::t_setallowedlocales(HPHP::String const&)
-_ZN4HPHP14c_SpoofChecker19t_setallowedlocalesERKNS_6StringE
-
-this_ => rdi
-localesList => rsi
-*/
-
 void th_12SpoofChecker_setAllowedLocales(ObjectData* this_, Value* localesList) asm("_ZN4HPHP14c_SpoofChecker19t_setallowedlocalesERKNS_6StringE");
 
-TypedValue* tg1_12SpoofChecker_setAllowedLocales(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_12SpoofChecker_setAllowedLocales(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_12SpoofChecker_setAllowedLocales(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_12SpoofChecker_setAllowedLocales(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToStringInPlace(args-0);
+  rv->m_type = KindOfNull;
   th_12SpoofChecker_setAllowedLocales((this_), &args[-0].m_data);
-  return rv;
 }
 
-TypedValue* tg_12SpoofChecker_setAllowedLocales(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 1LL) {
-        if (IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_data.num = 0LL;
-          rv.m_type = KindOfNull;
-          th_12SpoofChecker_setAllowedLocales((this_), &args[-0].m_data);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_12SpoofChecker_setAllowedLocales(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_12SpoofChecker_setAllowedLocales(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 1) {
+      if (IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfNull;
+        th_12SpoofChecker_setAllowedLocales((this_), &args[-0].m_data);
       } else {
-        throw_wrong_arguments_nr("SpoofChecker::setAllowedLocales", count, 1, 1, 1);
+        tg1_12SpoofChecker_setAllowedLocales(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("SpoofChecker::setAllowedLocales");
+      throw_wrong_arguments_nr("SpoofChecker::setAllowedLocales", count, 1, 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SpoofChecker::setAllowedLocales");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-void HPHP::c_SpoofChecker::t_setchecks(int)
-_ZN4HPHP14c_SpoofChecker11t_setchecksEi
-
-this_ => rdi
-checks => rsi
-*/
-
 void th_12SpoofChecker_setChecks(ObjectData* this_, int checks) asm("_ZN4HPHP14c_SpoofChecker11t_setchecksEi");
 
-TypedValue* tg1_12SpoofChecker_setChecks(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_12SpoofChecker_setChecks(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_12SpoofChecker_setChecks(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_12SpoofChecker_setChecks(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_data.num = 0LL;
-  rv->m_type = KindOfNull;
   tvCastToInt64InPlace(args-0);
+  rv->m_type = KindOfNull;
   th_12SpoofChecker_setChecks((this_), (int)(args[-0].m_data.num));
-  return rv;
 }
 
-TypedValue* tg_12SpoofChecker_setChecks(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 1LL) {
-        if ((args-0)->m_type == KindOfInt64) {
-          rv.m_data.num = 0LL;
-          rv.m_type = KindOfNull;
-          th_12SpoofChecker_setChecks((this_), (int)(args[-0].m_data.num));
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_12SpoofChecker_setChecks(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_12SpoofChecker_setChecks(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 1) {
+      if ((args - 0)->m_type == KindOfInt64) {
+        rv->m_type = KindOfNull;
+        th_12SpoofChecker_setChecks((this_), (int)(args[-0].m_data.num));
       } else {
-        throw_wrong_arguments_nr("SpoofChecker::setChecks", count, 1, 1, 1);
+        tg1_12SpoofChecker_setChecks(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("SpoofChecker::setChecks");
+      throw_wrong_arguments_nr("SpoofChecker::setChecks", count, 1, 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("SpoofChecker::setChecks");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_icu_uspoof.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_imagesprite.ext_hhvm.cpp

@@ -14,16 +14,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
+
 HPHP::VM::Instance* new_ImageSprite_Instance(HPHP::VM::Class* cls) {
   size_t nProps = cls->numDeclProperties();
   size_t builtinPropSize = sizeof(c_ImageSprite) - sizeof(ObjectData);
@@ -34,59 +36,36 @@ HPHP::VM::Instance* new_ImageSprite_Instance(HPHP::VM::Class* cls) {
 }
 
 IMPLEMENT_CLASS(ImageSprite);
-/*
-void HPHP::c_ImageSprite::t___construct()
-_ZN4HPHP13c_ImageSprite13t___constructEv
-
-this_ => rdi
-*/
-
 void th_11ImageSprite___construct(ObjectData* this_) asm("_ZN4HPHP13c_ImageSprite13t___constructEv");
 
-TypedValue* tg_11ImageSprite___construct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_data.num = 0LL;
-        rv.m_type = KindOfNull;
-        th_11ImageSprite___construct((this_));
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ImageSprite::__construct", 0, 1);
-      }
+TypedValue* tg_11ImageSprite___construct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfNull;
+      th_11ImageSprite___construct((this_));
     } else {
-      throw_instance_method_fatal("ImageSprite::__construct");
+      throw_toomany_arguments_nr("ImageSprite::__construct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::__construct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_addfile(HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP13c_ImageSprite9t_addfileERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-file => rdx
-options => rcx
-*/
-
 Value* th_11ImageSprite_addFile(Value* _rv, ObjectData* this_, Value* file, Value* options) asm("_ZN4HPHP13c_ImageSprite9t_addfileERKNS_6StringERKNS_5ArrayE");
 
-TypedValue* tg1_11ImageSprite_addFile(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_addFile(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_addFile(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_addFile(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   switch (count) {
   default: // count >= 2
     if ((args-1)->m_type != KindOfArray) {
@@ -98,65 +77,47 @@ TypedValue* tg1_11ImageSprite_addFile(TypedValue* rv, ActRec* ar, int64_t count,
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfObject;
   Array defVal1 = uninit_null();
-  th_11ImageSprite_addFile((&rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&defVal1));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  th_11ImageSprite_addFile(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&defVal1));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_11ImageSprite_addFile(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 1LL && count <= 2LL) {
-        if ((count <= 1 || (args-1)->m_type == KindOfArray) && IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfObject;
-          Array defVal1 = uninit_null();
-          th_11ImageSprite_addFile((&rv.m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&defVal1));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 2);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_addFile(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 2);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_addFile(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 1 && count <= 2) {
+      if ((count <= 1 || (args - 1)->m_type == KindOfArray) &&
+          IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfObject;
+        Array defVal1 = uninit_null();
+        th_11ImageSprite_addFile(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&defVal1));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_wrong_arguments_nr("ImageSprite::addFile", count, 1, 2, 1);
+        tg1_11ImageSprite_addFile(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::addFile");
+      throw_wrong_arguments_nr("ImageSprite::addFile", count, 1, 2, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::addFile");
+  }
+  frame_free_locals_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_addstring(HPHP::String const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP13c_ImageSprite11t_addstringERKNS_6StringES3_RKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-id => rdx
-data => rcx
-options => r8
-*/
-
 Value* th_11ImageSprite_addString(Value* _rv, ObjectData* this_, Value* id, Value* data, Value* options) asm("_ZN4HPHP13c_ImageSprite11t_addstringERKNS_6StringES3_RKNS_5ArrayE");
 
-TypedValue* tg1_11ImageSprite_addString(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_addString(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_addString(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_addString(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfArray) {
@@ -171,65 +132,48 @@ TypedValue* tg1_11ImageSprite_addString(TypedValue* rv, ActRec* ar, int64_t coun
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfObject;
   Array defVal2 = uninit_null();
-  th_11ImageSprite_addString((&rv->m_data), (this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  th_11ImageSprite_addString(&(rv->m_data), (this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_11ImageSprite_addString(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 2LL && count <= 3LL) {
-        if ((count <= 2 || (args-2)->m_type == KindOfArray) && IS_STRING_TYPE((args-1)->m_type) && IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfObject;
-          Array defVal2 = uninit_null();
-          th_11ImageSprite_addString((&rv.m_data), (this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_addString(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_addString(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 2 && count <= 3) {
+      if ((count <= 2 || (args - 2)->m_type == KindOfArray) &&
+          IS_STRING_TYPE((args - 1)->m_type) &&
+          IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfObject;
+        Array defVal2 = uninit_null();
+        th_11ImageSprite_addString(&(rv->m_data), (this_), &args[-0].m_data, &args[-1].m_data, (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_wrong_arguments_nr("ImageSprite::addString", count, 2, 3, 1);
+        tg1_11ImageSprite_addString(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::addString");
+      throw_wrong_arguments_nr("ImageSprite::addString", count, 2, 3, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::addString");
+  }
+  frame_free_locals_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_addurl(HPHP::String const&, int, HPHP::Array const&)
-_ZN4HPHP13c_ImageSprite8t_addurlERKNS_6StringEiRKNS_5ArrayE
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-url => rdx
-timeout_ms => rcx
-Options => r8
-*/
-
 Value* th_11ImageSprite_addUrl(Value* _rv, ObjectData* this_, Value* url, int timeout_ms, Value* Options) asm("_ZN4HPHP13c_ImageSprite8t_addurlERKNS_6StringEiRKNS_5ArrayE");
 
-TypedValue* tg1_11ImageSprite_addUrl(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_addUrl(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_addUrl(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_addUrl(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfArray) {
@@ -245,217 +189,153 @@ TypedValue* tg1_11ImageSprite_addUrl(TypedValue* rv, ActRec* ar, int64_t count,
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
+  rv->m_type = KindOfObject;
   Array defVal2 = uninit_null();
-  th_11ImageSprite_addUrl((&rv->m_data), (this_), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  th_11ImageSprite_addUrl(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_11ImageSprite_addUrl(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 1LL && count <= 3LL) {
-        if ((count <= 2 || (args-2)->m_type == KindOfArray) && (count <= 1 || (args-1)->m_type == KindOfInt64) && IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfObject;
-          Array defVal2 = uninit_null();
-          th_11ImageSprite_addUrl((&rv.m_data), (this_), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_addUrl(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_addUrl(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 1 && count <= 3) {
+      if ((count <= 2 || (args - 2)->m_type == KindOfArray) &&
+          (count <= 1 || (args - 1)->m_type == KindOfInt64) &&
+          IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfObject;
+        Array defVal2 = uninit_null();
+        th_11ImageSprite_addUrl(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? (int)(args[-1].m_data.num) : (int)(0), (count > 2) ? &args[-2].m_data : (Value*)(&defVal2));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_wrong_arguments_nr("ImageSprite::addUrl", count, 1, 3, 1);
+        tg1_11ImageSprite_addUrl(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::addUrl");
+      throw_wrong_arguments_nr("ImageSprite::addUrl", count, 1, 3, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::addUrl");
+  }
+  frame_free_locals_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_clear(HPHP::Variant const&)
-_ZN4HPHP13c_ImageSprite7t_clearERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-paths => rdx
-*/
-
 Value* th_11ImageSprite_clear(Value* _rv, ObjectData* this_, TypedValue* paths) asm("_ZN4HPHP13c_ImageSprite7t_clearERKNS_7VariantE");
 
-TypedValue* tg_11ImageSprite_clear(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count <= 1LL) {
-        rv.m_type = KindOfObject;
-        Variant defVal0;
-        th_11ImageSprite_clear((&rv.m_data), (this_), (count > 0) ? (args-0) : (TypedValue*)(&defVal0));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 1);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ImageSprite::clear", 1, 1);
-      }
+TypedValue* tg_11ImageSprite_clear(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count <= 1) {
+      rv->m_type = KindOfObject;
+      Variant defVal0;
+      th_11ImageSprite_clear(&(rv->m_data), (this_), (count > 0) ? (args-0) : (TypedValue*)(&defVal0));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("ImageSprite::clear");
+      throw_toomany_arguments_nr("ImageSprite::clear", 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::clear");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_loaddims(bool)
-_ZN4HPHP13c_ImageSprite10t_loaddimsEb
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-block => rdx
-*/
-
 Value* th_11ImageSprite_loadDims(Value* _rv, ObjectData* this_, bool block) asm("_ZN4HPHP13c_ImageSprite10t_loaddimsEb");
 
-TypedValue* tg1_11ImageSprite_loadDims(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_loadDims(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_loadDims(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_loadDims(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToBooleanInPlace(args-0);
-  th_11ImageSprite_loadDims((&rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_11ImageSprite_loadDims(&(rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_11ImageSprite_loadDims(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count <= 1LL) {
-        if ((count <= 0 || (args-0)->m_type == KindOfBoolean)) {
-          rv.m_type = KindOfObject;
-          th_11ImageSprite_loadDims((&rv.m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_loadDims(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_loadDims(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count <= 1) {
+      if ((count <= 0 || (args - 0)->m_type == KindOfBoolean)) {
+        rv->m_type = KindOfObject;
+        th_11ImageSprite_loadDims(&(rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_toomany_arguments_nr("ImageSprite::loadDims", 1, 1);
+        tg1_11ImageSprite_loadDims(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::loadDims");
+      throw_toomany_arguments_nr("ImageSprite::loadDims", 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::loadDims");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Object HPHP::c_ImageSprite::t_loadimages(bool)
-_ZN4HPHP13c_ImageSprite12t_loadimagesEb
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-block => rdx
-*/
-
 Value* th_11ImageSprite_loadImages(Value* _rv, ObjectData* this_, bool block) asm("_ZN4HPHP13c_ImageSprite12t_loadimagesEb");
 
-TypedValue* tg1_11ImageSprite_loadImages(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_loadImages(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_loadImages(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_loadImages(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfObject;
   tvCastToBooleanInPlace(args-0);
-  th_11ImageSprite_loadImages((&rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
-  if (rv->m_data.num == 0LL)rv->m_type = KindOfNull;
-  return rv;
+  rv->m_type = KindOfObject;
+  th_11ImageSprite_loadImages(&(rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
+  if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
 }
 
-TypedValue* tg_11ImageSprite_loadImages(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count <= 1LL) {
-        if ((count <= 0 || (args-0)->m_type == KindOfBoolean)) {
-          rv.m_type = KindOfObject;
-          th_11ImageSprite_loadImages((&rv.m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_loadImages(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 1);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_loadImages(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count <= 1) {
+      if ((count <= 0 || (args - 0)->m_type == KindOfBoolean)) {
+        rv->m_type = KindOfObject;
+        th_11ImageSprite_loadImages(&(rv->m_data), (this_), (count > 0) ? (bool)(args[-0].m_data.num) : (bool)(false));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_toomany_arguments_nr("ImageSprite::loadImages", 1, 1);
+        tg1_11ImageSprite_loadImages(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::loadImages");
+      throw_toomany_arguments_nr("ImageSprite::loadImages", 1, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 1);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::loadImages");
+  }
+  frame_free_locals_inl(ar, 1);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_ImageSprite::t_output(HPHP::String const&, HPHP::String const&, int)
-_ZN4HPHP13c_ImageSprite8t_outputERKNS_6StringES3_i
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-output_file => rdx
-format => rcx
-quality => r8
-*/
-
 Value* th_11ImageSprite_output(Value* _rv, ObjectData* this_, Value* output_file, Value* format, int quality) asm("_ZN4HPHP13c_ImageSprite8t_outputERKNS_6StringES3_i");
 
-TypedValue* tg1_11ImageSprite_output(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_output(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_output(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_output(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 3
     if ((args-2)->m_type != KindOfInt64) {
@@ -472,66 +352,48 @@ TypedValue* tg1_11ImageSprite_output(TypedValue* rv, ActRec* ar, int64_t count,
   case 0:
     break;
   }
+  rv->m_type = KindOfString;
   String defVal1 = "png";
-  th_11ImageSprite_output((&rv->m_data), (this_), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&defVal1), (count > 2) ? (int)(args[-2].m_data.num) : (int)(75));
+  th_11ImageSprite_output(&(rv->m_data), (this_), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&defVal1), (count > 2) ? (int)(args[-2].m_data.num) : (int)(75));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* tg_11ImageSprite_output(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count <= 3LL) {
-        if ((count <= 2 || (args-2)->m_type == KindOfInt64) && (count <= 1 || IS_STRING_TYPE((args-1)->m_type)) && (count <= 0 || IS_STRING_TYPE((args-0)->m_type))) {
-          rv.m_type = KindOfString;
-          String defVal1 = "png";
-          th_11ImageSprite_output((&rv.m_data), (this_), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&defVal1), (count > 2) ? (int)(args[-2].m_data.num) : (int)(75));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_output(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 3);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_output(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count <= 3) {
+      if ((count <= 2 || (args - 2)->m_type == KindOfInt64) &&
+          (count <= 1 || IS_STRING_TYPE((args - 1)->m_type)) &&
+          (count <= 0 || IS_STRING_TYPE((args - 0)->m_type))) {
+        rv->m_type = KindOfString;
+        String defVal1 = "png";
+        th_11ImageSprite_output(&(rv->m_data), (this_), (count > 0) ? &args[-0].m_data : (Value*)(&null_string), (count > 1) ? &args[-1].m_data : (Value*)(&defVal1), (count > 2) ? (int)(args[-2].m_data.num) : (int)(75));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_toomany_arguments_nr("ImageSprite::output", 3, 1);
+        tg1_11ImageSprite_output(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::output");
+      throw_toomany_arguments_nr("ImageSprite::output", 3, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::output");
+  }
+  frame_free_locals_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::String HPHP::c_ImageSprite::t_css(HPHP::String const&, HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP13c_ImageSprite5t_cssERKNS_6StringES3_S3_b
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-css_namespace => rdx
-sprite_file => rcx
-output_file => r8
-verbose => r9
-*/
-
 Value* th_11ImageSprite_css(Value* _rv, ObjectData* this_, Value* css_namespace, Value* sprite_file, Value* output_file, bool verbose) asm("_ZN4HPHP13c_ImageSprite5t_cssERKNS_6StringES3_S3_b");
 
-TypedValue* tg1_11ImageSprite_css(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) __attribute__((noinline,cold));
-TypedValue* tg1_11ImageSprite_css(TypedValue* rv, ActRec* ar, int64_t count, ObjectData* this_) {
+void tg1_11ImageSprite_css(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) __attribute__((noinline,cold));
+void tg1_11ImageSprite_css(TypedValue* rv, ActRec* ar, int32_t count, ObjectData* this_) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-  rv->m_type = KindOfString;
   switch (count) {
   default: // count >= 4
     if ((args-3)->m_type != KindOfBoolean) {
@@ -551,158 +413,117 @@ TypedValue* tg1_11ImageSprite_css(TypedValue* rv, ActRec* ar, int64_t count, Obj
   if (!IS_STRING_TYPE((args-0)->m_type)) {
     tvCastToStringInPlace(args-0);
   }
-  th_11ImageSprite_css((&rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? (bool)(args[-3].m_data.num) : (bool)(false));
+  rv->m_type = KindOfString;
+  th_11ImageSprite_css(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? (bool)(args[-3].m_data.num) : (bool)(false));
   if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* tg_11ImageSprite_css(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count >= 1LL && count <= 4LL) {
-        if ((count <= 3 || (args-3)->m_type == KindOfBoolean) && (count <= 2 || IS_STRING_TYPE((args-2)->m_type)) && (count <= 1 || IS_STRING_TYPE((args-1)->m_type)) && IS_STRING_TYPE((args-0)->m_type)) {
-          rv.m_type = KindOfString;
-          th_11ImageSprite_css((&rv.m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? (bool)(args[-3].m_data.num) : (bool)(false));
-          if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-          frame_free_locals_inl(ar, 4);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        } else {
-          tg1_11ImageSprite_css(&rv, ar, count , this_);
-          frame_free_locals_inl(ar, 4);
-          memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-          return &ar->m_r;
-        }
+TypedValue* tg_11ImageSprite_css(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count >= 1 && count <= 4) {
+      if ((count <= 3 || (args - 3)->m_type == KindOfBoolean) &&
+          (count <= 2 || IS_STRING_TYPE((args - 2)->m_type)) &&
+          (count <= 1 || IS_STRING_TYPE((args - 1)->m_type)) &&
+          IS_STRING_TYPE((args - 0)->m_type)) {
+        rv->m_type = KindOfString;
+        th_11ImageSprite_css(&(rv->m_data), (this_), &args[-0].m_data, (count > 1) ? &args[-1].m_data : (Value*)(&null_string), (count > 2) ? &args[-2].m_data : (Value*)(&null_string), (count > 3) ? (bool)(args[-3].m_data.num) : (bool)(false));
+        if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
       } else {
-        throw_wrong_arguments_nr("ImageSprite::css", count, 1, 4, 1);
+        tg1_11ImageSprite_css(rv, ar, count, this_);
       }
     } else {
-      throw_instance_method_fatal("ImageSprite::css");
+      throw_wrong_arguments_nr("ImageSprite::css", count, 1, 4, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 4);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::css");
+  }
+  frame_free_locals_inl(ar, 4);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Array HPHP::c_ImageSprite::t_geterrors()
-_ZN4HPHP13c_ImageSprite11t_geterrorsEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_11ImageSprite_getErrors(Value* _rv, ObjectData* this_) asm("_ZN4HPHP13c_ImageSprite11t_geterrorsEv");
 
-TypedValue* tg_11ImageSprite_getErrors(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfArray;
-        th_11ImageSprite_getErrors((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ImageSprite::getErrors", 0, 1);
-      }
+TypedValue* tg_11ImageSprite_getErrors(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfArray;
+      th_11ImageSprite_getErrors(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("ImageSprite::getErrors");
+      throw_toomany_arguments_nr("ImageSprite::getErrors", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::getErrors");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Array HPHP::c_ImageSprite::t_mapping()
-_ZN4HPHP13c_ImageSprite9t_mappingEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 Value* th_11ImageSprite_mapping(Value* _rv, ObjectData* this_) asm("_ZN4HPHP13c_ImageSprite9t_mappingEv");
 
-TypedValue* tg_11ImageSprite_mapping(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        rv.m_type = KindOfArray;
-        th_11ImageSprite_mapping((&rv.m_data), (this_));
-        if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ImageSprite::mapping", 0, 1);
-      }
+TypedValue* tg_11ImageSprite_mapping(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      rv->m_type = KindOfArray;
+      th_11ImageSprite_mapping(&(rv->m_data), (this_));
+      if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("ImageSprite::mapping");
+      throw_toomany_arguments_nr("ImageSprite::mapping", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::mapping");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-/*
-HPHP::Variant HPHP::c_ImageSprite::t___destruct()
-_ZN4HPHP13c_ImageSprite12t___destructEv
-
-(return value) => rax
-_rv => rdi
-this_ => rsi
-*/
-
 TypedValue* th_11ImageSprite___destruct(TypedValue* _rv, ObjectData* this_) asm("_ZN4HPHP13c_ImageSprite12t___destructEv");
 
-TypedValue* tg_11ImageSprite___destruct(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    ObjectData* this_ = (ar->hasThis() ? ar->getThis() : NULL);
-    if (this_) {
-      if (count == 0LL) {
-        th_11ImageSprite___destruct((&(rv)), (this_));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_inl(ar, 0);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        throw_toomany_arguments_nr("ImageSprite::__destruct", 0, 1);
-      }
+TypedValue* tg_11ImageSprite___destruct(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  ObjectData* this_ = (ar->hasThis() ? ar->getThis() : nullptr);
+  if (this_) {
+    if (count == 0) {
+      th_11ImageSprite___destruct(rv, (this_));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_instance_method_fatal("ImageSprite::__destruct");
+      throw_toomany_arguments_nr("ImageSprite::__destruct", 0, 1);
+      rv->m_data.num = 0LL;
+      rv->m_type = KindOfNull;
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_inl(ar, 0);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_instance_method_fatal("ImageSprite::__destruct");
+  }
+  frame_free_locals_inl(ar, 0);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_imagesprite.ext_hhvm.h

@@ -16,6 +16,4 @@
 */
 namespace HPHP {
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_imap.ext_hhvm.h

@@ -16,840 +16,140 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_imap_8bit(HPHP::String const&)
-_ZN4HPHP11f_imap_8bitERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-str => rsi
-*/
-
 TypedValue* fh_imap_8bit(TypedValue* _rv, Value* str) asm("_ZN4HPHP11f_imap_8bitERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_alerts()
-_ZN4HPHP13f_imap_alertsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_imap_alerts(TypedValue* _rv) asm("_ZN4HPHP13f_imap_alertsEv");
 
-/*
-bool HPHP::f_imap_append(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP13f_imap_appendERKNS_6ObjectERKNS_6StringES5_S5_
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-message => rdx
-options => rcx
-*/
-
 bool fh_imap_append(Value* imap_stream, Value* mailbox, Value* message, Value* options) asm("_ZN4HPHP13f_imap_appendERKNS_6ObjectERKNS_6StringES5_S5_");
 
-/*
-HPHP::Variant HPHP::f_imap_base64(HPHP::String const&)
-_ZN4HPHP13f_imap_base64ERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-text => rsi
-*/
-
 TypedValue* fh_imap_base64(TypedValue* _rv, Value* text) asm("_ZN4HPHP13f_imap_base64ERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_binary(HPHP::String const&)
-_ZN4HPHP13f_imap_binaryERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-str => rsi
-*/
-
 TypedValue* fh_imap_binary(TypedValue* _rv, Value* str) asm("_ZN4HPHP13f_imap_binaryERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_body(HPHP::Object const&, long, long)
-_ZN4HPHP11f_imap_bodyERKNS_6ObjectEll
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-options => rcx
-*/
-
 TypedValue* fh_imap_body(TypedValue* _rv, Value* imap_stream, long msg_number, long options) asm("_ZN4HPHP11f_imap_bodyERKNS_6ObjectEll");
 
-/*
-HPHP::Variant HPHP::f_imap_bodystruct(HPHP::Object const&, long, HPHP::String const&)
-_ZN4HPHP17f_imap_bodystructERKNS_6ObjectElRKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-section => rcx
-*/
-
 TypedValue* fh_imap_bodystruct(TypedValue* _rv, Value* imap_stream, long msg_number, Value* section) asm("_ZN4HPHP17f_imap_bodystructERKNS_6ObjectElRKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_check(HPHP::Object const&)
-_ZN4HPHP12f_imap_checkERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-*/
-
 TypedValue* fh_imap_check(TypedValue* _rv, Value* imap_stream) asm("_ZN4HPHP12f_imap_checkERKNS_6ObjectE");
 
-/*
-bool HPHP::f_imap_clearflag_full(HPHP::Object const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP21f_imap_clearflag_fullERKNS_6ObjectERKNS_6StringES5_l
-
-(return value) => rax
-imap_stream => rdi
-sequence => rsi
-flag => rdx
-options => rcx
-*/
-
 bool fh_imap_clearflag_full(Value* imap_stream, Value* sequence, Value* flag, long options) asm("_ZN4HPHP21f_imap_clearflag_fullERKNS_6ObjectERKNS_6StringES5_l");
 
-/*
-bool HPHP::f_imap_close(HPHP::Object const&, long)
-_ZN4HPHP12f_imap_closeERKNS_6ObjectEl
-
-(return value) => rax
-imap_stream => rdi
-flag => rsi
-*/
-
 bool fh_imap_close(Value* imap_stream, long flag) asm("_ZN4HPHP12f_imap_closeERKNS_6ObjectEl");
 
-/*
-bool HPHP::f_imap_createmailbox(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP20f_imap_createmailboxERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-*/
-
 bool fh_imap_createmailbox(Value* imap_stream, Value* mailbox) asm("_ZN4HPHP20f_imap_createmailboxERKNS_6ObjectERKNS_6StringE");
 
-/*
-bool HPHP::f_imap_delete(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP13f_imap_deleteERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-imap_stream => rdi
-msg_number => rsi
-options => rdx
-*/
-
 bool fh_imap_delete(Value* imap_stream, Value* msg_number, long options) asm("_ZN4HPHP13f_imap_deleteERKNS_6ObjectERKNS_6StringEl");
 
-/*
-bool HPHP::f_imap_deletemailbox(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP20f_imap_deletemailboxERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-*/
-
 bool fh_imap_deletemailbox(Value* imap_stream, Value* mailbox) asm("_ZN4HPHP20f_imap_deletemailboxERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_errors()
-_ZN4HPHP13f_imap_errorsEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_imap_errors(TypedValue* _rv) asm("_ZN4HPHP13f_imap_errorsEv");
 
-/*
-bool HPHP::f_imap_expunge(HPHP::Object const&)
-_ZN4HPHP14f_imap_expungeERKNS_6ObjectE
-
-(return value) => rax
-imap_stream => rdi
-*/
-
 bool fh_imap_expunge(Value* imap_stream) asm("_ZN4HPHP14f_imap_expungeERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_fetch_overview(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP21f_imap_fetch_overviewERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-sequence => rdx
-options => rcx
-*/
-
 TypedValue* fh_imap_fetch_overview(TypedValue* _rv, Value* imap_stream, Value* sequence, long options) asm("_ZN4HPHP21f_imap_fetch_overviewERKNS_6ObjectERKNS_6StringEl");
 
-/*
-HPHP::Variant HPHP::f_imap_fetchbody(HPHP::Object const&, long, HPHP::String const&, long)
-_ZN4HPHP16f_imap_fetchbodyERKNS_6ObjectElRKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-section => rcx
-options => r8
-*/
-
 TypedValue* fh_imap_fetchbody(TypedValue* _rv, Value* imap_stream, long msg_number, Value* section, long options) asm("_ZN4HPHP16f_imap_fetchbodyERKNS_6ObjectElRKNS_6StringEl");
 
-/*
-HPHP::Variant HPHP::f_imap_fetchheader(HPHP::Object const&, long, long)
-_ZN4HPHP18f_imap_fetchheaderERKNS_6ObjectEll
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-options => rcx
-*/
-
 TypedValue* fh_imap_fetchheader(TypedValue* _rv, Value* imap_stream, long msg_number, long options) asm("_ZN4HPHP18f_imap_fetchheaderERKNS_6ObjectEll");
 
-/*
-HPHP::Variant HPHP::f_imap_fetchstructure(HPHP::Object const&, long, long)
-_ZN4HPHP21f_imap_fetchstructureERKNS_6ObjectEll
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-options => rcx
-*/
-
 TypedValue* fh_imap_fetchstructure(TypedValue* _rv, Value* imap_stream, long msg_number, long options) asm("_ZN4HPHP21f_imap_fetchstructureERKNS_6ObjectEll");
 
-/*
-bool HPHP::f_imap_gc(HPHP::Object const&, long)
-_ZN4HPHP9f_imap_gcERKNS_6ObjectEl
-
-(return value) => rax
-imap_stream => rdi
-caches => rsi
-*/
-
 bool fh_imap_gc(Value* imap_stream, long caches) asm("_ZN4HPHP9f_imap_gcERKNS_6ObjectEl");
 
-/*
-HPHP::Variant HPHP::f_imap_get_quota(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP16f_imap_get_quotaERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-quota_root => rdx
-*/
-
 TypedValue* fh_imap_get_quota(TypedValue* _rv, Value* imap_stream, Value* quota_root) asm("_ZN4HPHP16f_imap_get_quotaERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_get_quotaroot(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP20f_imap_get_quotarootERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-quota_root => rdx
-*/
-
 TypedValue* fh_imap_get_quotaroot(TypedValue* _rv, Value* imap_stream, Value* quota_root) asm("_ZN4HPHP20f_imap_get_quotarootERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_getacl(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP13f_imap_getaclERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-mailbox => rdx
-*/
-
 TypedValue* fh_imap_getacl(TypedValue* _rv, Value* imap_stream, Value* mailbox) asm("_ZN4HPHP13f_imap_getaclERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_getmailboxes(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP19f_imap_getmailboxesERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_getmailboxes(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP19f_imap_getmailboxesERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_getsubscribed(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP20f_imap_getsubscribedERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_getsubscribed(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP20f_imap_getsubscribedERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_header(HPHP::Object const&, long, long, long, HPHP::String const&)
-_ZN4HPHP13f_imap_headerERKNS_6ObjectElllRKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-fromlength => rcx
-subjectlength => r8
-defaulthost => r9
-*/
-
 TypedValue* fh_imap_header(TypedValue* _rv, Value* imap_stream, long msg_number, long fromlength, long subjectlength, Value* defaulthost) asm("_ZN4HPHP13f_imap_headerERKNS_6ObjectElllRKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_headerinfo(HPHP::Object const&, long, long, long, HPHP::String const&)
-_ZN4HPHP17f_imap_headerinfoERKNS_6ObjectElllRKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-fromlength => rcx
-subjectlength => r8
-defaulthost => r9
-*/
-
 TypedValue* fh_imap_headerinfo(TypedValue* _rv, Value* imap_stream, long msg_number, long fromlength, long subjectlength, Value* defaulthost) asm("_ZN4HPHP17f_imap_headerinfoERKNS_6ObjectElllRKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_headers(HPHP::Object const&)
-_ZN4HPHP14f_imap_headersERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-*/
-
 TypedValue* fh_imap_headers(TypedValue* _rv, Value* imap_stream) asm("_ZN4HPHP14f_imap_headersERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_last_error()
-_ZN4HPHP17f_imap_last_errorEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 TypedValue* fh_imap_last_error(TypedValue* _rv) asm("_ZN4HPHP17f_imap_last_errorEv");
 
-/*
-HPHP::Variant HPHP::f_imap_list(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_imap_listERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_list(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP11f_imap_listERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_listmailbox(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP18f_imap_listmailboxERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_listmailbox(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP18f_imap_listmailboxERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_listscan(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP15f_imap_listscanERKNS_6ObjectERKNS_6StringES5_S5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-content => r8
-*/
-
 TypedValue* fh_imap_listscan(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern, Value* content) asm("_ZN4HPHP15f_imap_listscanERKNS_6ObjectERKNS_6StringES5_S5_");
 
-/*
-HPHP::Variant HPHP::f_imap_listsubscribed(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP21f_imap_listsubscribedERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_listsubscribed(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP21f_imap_listsubscribedERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_lsub(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_imap_lsubERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-*/
-
 TypedValue* fh_imap_lsub(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern) asm("_ZN4HPHP11f_imap_lsubERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_mail_compose(HPHP::Array const&, HPHP::Array const&)
-_ZN4HPHP19f_imap_mail_composeERKNS_5ArrayES2_
-
-(return value) => rax
-_rv => rdi
-envelope => rsi
-body => rdx
-*/
-
 TypedValue* fh_imap_mail_compose(TypedValue* _rv, Value* envelope, Value* body) asm("_ZN4HPHP19f_imap_mail_composeERKNS_5ArrayES2_");
 
-/*
-bool HPHP::f_imap_mail_copy(HPHP::Object const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP16f_imap_mail_copyERKNS_6ObjectERKNS_6StringES5_l
-
-(return value) => rax
-imap_stream => rdi
-msglist => rsi
-mailbox => rdx
-options => rcx
-*/
-
 bool fh_imap_mail_copy(Value* imap_stream, Value* msglist, Value* mailbox, long options) asm("_ZN4HPHP16f_imap_mail_copyERKNS_6ObjectERKNS_6StringES5_l");
 
-/*
-bool HPHP::f_imap_mail_move(HPHP::Object const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP16f_imap_mail_moveERKNS_6ObjectERKNS_6StringES5_l
-
-(return value) => rax
-imap_stream => rdi
-msglist => rsi
-mailbox => rdx
-options => rcx
-*/
-
 bool fh_imap_mail_move(Value* imap_stream, Value* msglist, Value* mailbox, long options) asm("_ZN4HPHP16f_imap_mail_moveERKNS_6ObjectERKNS_6StringES5_l");
 
-/*
-bool HPHP::f_imap_mail(HPHP::String const&, HPHP::String const&, HPHP::String const&, HPHP::String const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_imap_mailERKNS_6StringES2_S2_S2_S2_S2_S2_
-
-(return value) => rax
-to => rdi
-subject => rsi
-message => rdx
-additional_headers => rcx
-cc => r8
-bcc => r9
-rpath => st0
-*/
-
 bool fh_imap_mail(Value* to, Value* subject, Value* message, Value* additional_headers, Value* cc, Value* bcc, Value* rpath) asm("_ZN4HPHP11f_imap_mailERKNS_6StringES2_S2_S2_S2_S2_S2_");
 
-/*
-HPHP::Variant HPHP::f_imap_mailboxmsginfo(HPHP::Object const&)
-_ZN4HPHP21f_imap_mailboxmsginfoERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-*/
-
 TypedValue* fh_imap_mailboxmsginfo(TypedValue* _rv, Value* imap_stream) asm("_ZN4HPHP21f_imap_mailboxmsginfoERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_mime_header_decode(HPHP::String const&)
-_ZN4HPHP25f_imap_mime_header_decodeERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-text => rsi
-*/
-
 TypedValue* fh_imap_mime_header_decode(TypedValue* _rv, Value* text) asm("_ZN4HPHP25f_imap_mime_header_decodeERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_msgno(HPHP::Object const&, long)
-_ZN4HPHP12f_imap_msgnoERKNS_6ObjectEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-uid => rdx
-*/
-
 TypedValue* fh_imap_msgno(TypedValue* _rv, Value* imap_stream, long uid) asm("_ZN4HPHP12f_imap_msgnoERKNS_6ObjectEl");
 
-/*
-HPHP::Variant HPHP::f_imap_num_msg(HPHP::Object const&)
-_ZN4HPHP14f_imap_num_msgERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-*/
-
 TypedValue* fh_imap_num_msg(TypedValue* _rv, Value* imap_stream) asm("_ZN4HPHP14f_imap_num_msgERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_num_recent(HPHP::Object const&)
-_ZN4HPHP17f_imap_num_recentERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-*/
-
 TypedValue* fh_imap_num_recent(TypedValue* _rv, Value* imap_stream) asm("_ZN4HPHP17f_imap_num_recentERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_open(HPHP::String const&, HPHP::String const&, HPHP::String const&, long, long)
-_ZN4HPHP11f_imap_openERKNS_6StringES2_S2_ll
-
-(return value) => rax
-_rv => rdi
-mailbox => rsi
-username => rdx
-password => rcx
-options => r8
-retries => r9
-*/
-
 TypedValue* fh_imap_open(TypedValue* _rv, Value* mailbox, Value* username, Value* password, long options, long retries) asm("_ZN4HPHP11f_imap_openERKNS_6StringES2_S2_ll");
 
-/*
-bool HPHP::f_imap_ping(HPHP::Object const&)
-_ZN4HPHP11f_imap_pingERKNS_6ObjectE
-
-(return value) => rax
-imap_stream => rdi
-*/
-
 bool fh_imap_ping(Value* imap_stream) asm("_ZN4HPHP11f_imap_pingERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_imap_qprint(HPHP::String const&)
-_ZN4HPHP13f_imap_qprintERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-str => rsi
-*/
-
 TypedValue* fh_imap_qprint(TypedValue* _rv, Value* str) asm("_ZN4HPHP13f_imap_qprintERKNS_6StringE");
 
-/*
-bool HPHP::f_imap_renamemailbox(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP20f_imap_renamemailboxERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-imap_stream => rdi
-old_mbox => rsi
-new_mbox => rdx
-*/
-
 bool fh_imap_renamemailbox(Value* imap_stream, Value* old_mbox, Value* new_mbox) asm("_ZN4HPHP20f_imap_renamemailboxERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-bool HPHP::f_imap_reopen(HPHP::Object const&, HPHP::String const&, long, long)
-_ZN4HPHP13f_imap_reopenERKNS_6ObjectERKNS_6StringEll
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-options => rdx
-retries => rcx
-*/
-
 bool fh_imap_reopen(Value* imap_stream, Value* mailbox, long options, long retries) asm("_ZN4HPHP13f_imap_reopenERKNS_6ObjectERKNS_6StringEll");
 
-/*
-HPHP::Variant HPHP::f_imap_rfc822_parse_adrlist(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP27f_imap_rfc822_parse_adrlistERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-address => rsi
-default_host => rdx
-*/
-
 TypedValue* fh_imap_rfc822_parse_adrlist(TypedValue* _rv, Value* address, Value* default_host) asm("_ZN4HPHP27f_imap_rfc822_parse_adrlistERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_imap_rfc822_parse_headers(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP27f_imap_rfc822_parse_headersERKNS_6StringES2_
-
-(return value) => rax
-_rv => rdi
-headers => rsi
-defaulthost => rdx
-*/
-
 TypedValue* fh_imap_rfc822_parse_headers(TypedValue* _rv, Value* headers, Value* defaulthost) asm("_ZN4HPHP27f_imap_rfc822_parse_headersERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_imap_rfc822_write_address(HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP27f_imap_rfc822_write_addressERKNS_6StringES2_S2_
-
-(return value) => rax
-_rv => rdi
-mailbox => rsi
-host => rdx
-personal => rcx
-*/
-
 TypedValue* fh_imap_rfc822_write_address(TypedValue* _rv, Value* mailbox, Value* host, Value* personal) asm("_ZN4HPHP27f_imap_rfc822_write_addressERKNS_6StringES2_S2_");
 
-/*
-bool HPHP::f_imap_savebody(HPHP::Object const&, HPHP::Variant const&, long, HPHP::String const&, long)
-_ZN4HPHP15f_imap_savebodyERKNS_6ObjectERKNS_7VariantElRKNS_6StringEl
-
-(return value) => rax
-imap_stream => rdi
-file => rsi
-msg_number => rdx
-part_number => rcx
-options => r8
-*/
-
 bool fh_imap_savebody(Value* imap_stream, TypedValue* file, long msg_number, Value* part_number, long options) asm("_ZN4HPHP15f_imap_savebodyERKNS_6ObjectERKNS_7VariantElRKNS_6StringEl");
 
-/*
-HPHP::Variant HPHP::f_imap_scanmailbox(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP18f_imap_scanmailboxERKNS_6ObjectERKNS_6StringES5_S5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-ref => rdx
-pattern => rcx
-content => r8
-*/
-
 TypedValue* fh_imap_scanmailbox(TypedValue* _rv, Value* imap_stream, Value* ref, Value* pattern, Value* content) asm("_ZN4HPHP18f_imap_scanmailboxERKNS_6ObjectERKNS_6StringES5_S5_");
 
-/*
-HPHP::Variant HPHP::f_imap_search(HPHP::Object const&, HPHP::String const&, long, HPHP::String const&)
-_ZN4HPHP13f_imap_searchERKNS_6ObjectERKNS_6StringElS5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-criteria => rdx
-options => rcx
-charset => r8
-*/
-
 TypedValue* fh_imap_search(TypedValue* _rv, Value* imap_stream, Value* criteria, long options, Value* charset) asm("_ZN4HPHP13f_imap_searchERKNS_6ObjectERKNS_6StringElS5_");
 
-/*
-bool HPHP::f_imap_set_quota(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP16f_imap_set_quotaERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-imap_stream => rdi
-quota_root => rsi
-quota_limit => rdx
-*/
-
 bool fh_imap_set_quota(Value* imap_stream, Value* quota_root, long quota_limit) asm("_ZN4HPHP16f_imap_set_quotaERKNS_6ObjectERKNS_6StringEl");
 
-/*
-bool HPHP::f_imap_setacl(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP13f_imap_setaclERKNS_6ObjectERKNS_6StringES5_S5_
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-id => rdx
-rights => rcx
-*/
-
 bool fh_imap_setacl(Value* imap_stream, Value* mailbox, Value* id, Value* rights) asm("_ZN4HPHP13f_imap_setaclERKNS_6ObjectERKNS_6StringES5_S5_");
 
-/*
-bool HPHP::f_imap_setflag_full(HPHP::Object const&, HPHP::String const&, HPHP::String const&, long)
-_ZN4HPHP19f_imap_setflag_fullERKNS_6ObjectERKNS_6StringES5_l
-
-(return value) => rax
-imap_stream => rdi
-sequence => rsi
-flag => rdx
-options => rcx
-*/
-
 bool fh_imap_setflag_full(Value* imap_stream, Value* sequence, Value* flag, long options) asm("_ZN4HPHP19f_imap_setflag_fullERKNS_6ObjectERKNS_6StringES5_l");
 
-/*
-HPHP::Variant HPHP::f_imap_sort(HPHP::Object const&, long, long, long, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_imap_sortERKNS_6ObjectElllRKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-criteria => rdx
-reverse => rcx
-options => r8
-search_criteria => r9
-charset => st0
-*/
-
 TypedValue* fh_imap_sort(TypedValue* _rv, Value* imap_stream, long criteria, long reverse, long options, Value* search_criteria, Value* charset) asm("_ZN4HPHP11f_imap_sortERKNS_6ObjectElllRKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_imap_status(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP13f_imap_statusERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-mailbox => rdx
-options => rcx
-*/
-
 TypedValue* fh_imap_status(TypedValue* _rv, Value* imap_stream, Value* mailbox, long options) asm("_ZN4HPHP13f_imap_statusERKNS_6ObjectERKNS_6StringEl");
 
-/*
-bool HPHP::f_imap_subscribe(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP16f_imap_subscribeERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-*/
-
 bool fh_imap_subscribe(Value* imap_stream, Value* mailbox) asm("_ZN4HPHP16f_imap_subscribeERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_thread(HPHP::Object const&, long)
-_ZN4HPHP13f_imap_threadERKNS_6ObjectEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-options => rdx
-*/
-
 TypedValue* fh_imap_thread(TypedValue* _rv, Value* imap_stream, long options) asm("_ZN4HPHP13f_imap_threadERKNS_6ObjectEl");
 
-/*
-HPHP::Variant HPHP::f_imap_timeout(long, long)
-_ZN4HPHP14f_imap_timeoutEll
-
-(return value) => rax
-_rv => rdi
-timeout_type => rsi
-timeout => rdx
-*/
-
 TypedValue* fh_imap_timeout(TypedValue* _rv, long timeout_type, long timeout) asm("_ZN4HPHP14f_imap_timeoutEll");
 
-/*
-HPHP::Variant HPHP::f_imap_uid(HPHP::Object const&, long)
-_ZN4HPHP10f_imap_uidERKNS_6ObjectEl
-
-(return value) => rax
-_rv => rdi
-imap_stream => rsi
-msg_number => rdx
-*/
-
 TypedValue* fh_imap_uid(TypedValue* _rv, Value* imap_stream, long msg_number) asm("_ZN4HPHP10f_imap_uidERKNS_6ObjectEl");
 
-/*
-bool HPHP::f_imap_undelete(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP15f_imap_undeleteERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-imap_stream => rdi
-msg_number => rsi
-flags => rdx
-*/
-
 bool fh_imap_undelete(Value* imap_stream, Value* msg_number, long flags) asm("_ZN4HPHP15f_imap_undeleteERKNS_6ObjectERKNS_6StringEl");
 
-/*
-bool HPHP::f_imap_unsubscribe(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP18f_imap_unsubscribeERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-imap_stream => rdi
-mailbox => rsi
-*/
-
 bool fh_imap_unsubscribe(Value* imap_stream, Value* mailbox) asm("_ZN4HPHP18f_imap_unsubscribeERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_utf7_decode(HPHP::String const&)
-_ZN4HPHP18f_imap_utf7_decodeERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-text => rsi
-*/
-
 TypedValue* fh_imap_utf7_decode(TypedValue* _rv, Value* text) asm("_ZN4HPHP18f_imap_utf7_decodeERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_utf7_encode(HPHP::String const&)
-_ZN4HPHP18f_imap_utf7_encodeERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-data => rsi
-*/
-
 TypedValue* fh_imap_utf7_encode(TypedValue* _rv, Value* data) asm("_ZN4HPHP18f_imap_utf7_encodeERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_imap_utf8(HPHP::String const&)
-_ZN4HPHP11f_imap_utf8ERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-mime_encoded_text => rsi
-*/
-
 TypedValue* fh_imap_utf8(TypedValue* _rv, Value* mime_encoded_text) asm("_ZN4HPHP11f_imap_utf8ERKNS_6StringE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_intl.ext_hhvm.h

@@ -16,232 +16,42 @@
 */
 namespace HPHP {
 
-/*
-long HPHP::f_intl_get_error_code()
-_ZN4HPHP21f_intl_get_error_codeEv
-
-(return value) => rax
-*/
-
 long fh_intl_get_error_code() asm("_ZN4HPHP21f_intl_get_error_codeEv");
 
-/*
-HPHP::String HPHP::f_intl_get_error_message()
-_ZN4HPHP24f_intl_get_error_messageEv
-
-(return value) => rax
-_rv => rdi
-*/
-
 Value* fh_intl_get_error_message(Value* _rv) asm("_ZN4HPHP24f_intl_get_error_messageEv");
 
-/*
-HPHP::String HPHP::f_intl_error_name(long)
-_ZN4HPHP17f_intl_error_nameEl
-
-(return value) => rax
-_rv => rdi
-error_code => rsi
-*/
-
 Value* fh_intl_error_name(Value* _rv, long error_code) asm("_ZN4HPHP17f_intl_error_nameEl");
 
-/*
-bool HPHP::f_intl_is_failure(long)
-_ZN4HPHP17f_intl_is_failureEl
-
-(return value) => rax
-error_code => rdi
-*/
-
 bool fh_intl_is_failure(long error_code) asm("_ZN4HPHP17f_intl_is_failureEl");
 
-/*
-HPHP::Variant HPHP::f_collator_asort(HPHP::Variant const&, HPHP::VRefParamValue const&, long)
-_ZN4HPHP16f_collator_asortERKNS_7VariantERKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-arr => rdx
-sort_flag => rcx
-*/
-
 TypedValue* fh_collator_asort(TypedValue* _rv, TypedValue* obj, TypedValue* arr, long sort_flag) asm("_ZN4HPHP16f_collator_asortERKNS_7VariantERKNS_14VRefParamValueEl");
 
-/*
-HPHP::Variant HPHP::f_collator_compare(HPHP::Variant const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP18f_collator_compareERKNS_7VariantERKNS_6StringES5_
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-str1 => rdx
-str2 => rcx
-*/
-
 TypedValue* fh_collator_compare(TypedValue* _rv, TypedValue* obj, Value* str1, Value* str2) asm("_ZN4HPHP18f_collator_compareERKNS_7VariantERKNS_6StringES5_");
 
-/*
-HPHP::Variant HPHP::f_collator_create(HPHP::String const&)
-_ZN4HPHP17f_collator_createERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-locale => rsi
-*/
-
 TypedValue* fh_collator_create(TypedValue* _rv, Value* locale) asm("_ZN4HPHP17f_collator_createERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_collator_get_attribute(HPHP::Variant const&, long)
-_ZN4HPHP24f_collator_get_attributeERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-attr => rdx
-*/
-
 TypedValue* fh_collator_get_attribute(TypedValue* _rv, TypedValue* obj, long attr) asm("_ZN4HPHP24f_collator_get_attributeERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_collator_get_error_code(HPHP::Variant const&)
-_ZN4HPHP25f_collator_get_error_codeERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_collator_get_error_code(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP25f_collator_get_error_codeERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_collator_get_error_message(HPHP::Variant const&)
-_ZN4HPHP28f_collator_get_error_messageERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_collator_get_error_message(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP28f_collator_get_error_messageERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_collator_get_locale(HPHP::Variant const&, long)
-_ZN4HPHP21f_collator_get_localeERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-type => rdx
-*/
-
 TypedValue* fh_collator_get_locale(TypedValue* _rv, TypedValue* obj, long type) asm("_ZN4HPHP21f_collator_get_localeERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_collator_get_strength(HPHP::Variant const&)
-_ZN4HPHP23f_collator_get_strengthERKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_collator_get_strength(TypedValue* _rv, TypedValue* obj) asm("_ZN4HPHP23f_collator_get_strengthERKNS_7VariantE");
 
-/*
-HPHP::Variant HPHP::f_collator_set_attribute(HPHP::Variant const&, long, long)
-_ZN4HPHP24f_collator_set_attributeERKNS_7VariantEll
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-attr => rdx
-val => rcx
-*/
-
 TypedValue* fh_collator_set_attribute(TypedValue* _rv, TypedValue* obj, long attr, long val) asm("_ZN4HPHP24f_collator_set_attributeERKNS_7VariantEll");
 
-/*
-HPHP::Variant HPHP::f_collator_set_strength(HPHP::Variant const&, long)
-_ZN4HPHP23f_collator_set_strengthERKNS_7VariantEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-strength => rdx
-*/
-
 TypedValue* fh_collator_set_strength(TypedValue* _rv, TypedValue* obj, long strength) asm("_ZN4HPHP23f_collator_set_strengthERKNS_7VariantEl");
 
-/*
-HPHP::Variant HPHP::f_collator_sort_with_sort_keys(HPHP::Variant const&, HPHP::VRefParamValue const&)
-_ZN4HPHP30f_collator_sort_with_sort_keysERKNS_7VariantERKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-arr => rdx
-*/
-
 TypedValue* fh_collator_sort_with_sort_keys(TypedValue* _rv, TypedValue* obj, TypedValue* arr) asm("_ZN4HPHP30f_collator_sort_with_sort_keysERKNS_7VariantERKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_collator_sort(HPHP::Variant const&, HPHP::VRefParamValue const&, long)
-_ZN4HPHP15f_collator_sortERKNS_7VariantERKNS_14VRefParamValueEl
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-arr => rdx
-sort_flag => rcx
-*/
-
 TypedValue* fh_collator_sort(TypedValue* _rv, TypedValue* obj, TypedValue* arr, long sort_flag) asm("_ZN4HPHP15f_collator_sortERKNS_7VariantERKNS_14VRefParamValueEl");
 
-/*
-HPHP::Variant HPHP::f_idn_to_ascii(HPHP::String const&, long, long, HPHP::VRefParamValue const&)
-_ZN4HPHP14f_idn_to_asciiERKNS_6StringEllRKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-domain => rsi
-options => rdx
-variant => rcx
-idna_info => r8
-*/
-
 TypedValue* fh_idn_to_ascii(TypedValue* _rv, Value* domain, long options, long variant, TypedValue* idna_info) asm("_ZN4HPHP14f_idn_to_asciiERKNS_6StringEllRKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_idn_to_unicode(HPHP::String const&, long, long, HPHP::VRefParamValue const&)
-_ZN4HPHP16f_idn_to_unicodeERKNS_6StringEllRKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-domain => rsi
-options => rdx
-variant => rcx
-idna_info => r8
-*/
-
 TypedValue* fh_idn_to_unicode(TypedValue* _rv, Value* domain, long options, long variant, TypedValue* idna_info) asm("_ZN4HPHP16f_idn_to_unicodeERKNS_6StringEllRKNS_14VRefParamValueE");
 
-/*
-HPHP::Variant HPHP::f_idn_to_utf8(HPHP::String const&, long, long, HPHP::VRefParamValue const&)
-_ZN4HPHP13f_idn_to_utf8ERKNS_6StringEllRKNS_14VRefParamValueE
-
-(return value) => rax
-_rv => rdi
-domain => rsi
-options => rdx
-variant => rcx
-idna_info => r8
-*/
-
 TypedValue* fh_idn_to_utf8(TypedValue* _rv, Value* domain, long options, long variant, TypedValue* idna_info) asm("_ZN4HPHP13f_idn_to_utf8ERKNS_6StringEllRKNS_14VRefParamValueE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_ipc.ext_hhvm.h

@@ -16,226 +16,42 @@
 */
 namespace HPHP {
 
-/*
-long HPHP::f_ftok(HPHP::String const&, HPHP::String const&)
-_ZN4HPHP6f_ftokERKNS_6StringES2_
-
-(return value) => rax
-pathname => rdi
-proj => rsi
-*/
-
 long fh_ftok(Value* pathname, Value* proj) asm("_ZN4HPHP6f_ftokERKNS_6StringES2_");
 
-/*
-HPHP::Variant HPHP::f_msg_get_queue(long, long)
-_ZN4HPHP15f_msg_get_queueEll
-
-(return value) => rax
-_rv => rdi
-key => rsi
-perms => rdx
-*/
-
 TypedValue* fh_msg_get_queue(TypedValue* _rv, long key, long perms) asm("_ZN4HPHP15f_msg_get_queueEll");
 
-/*
-bool HPHP::f_msg_queue_exists(long)
-_ZN4HPHP18f_msg_queue_existsEl
-
-(return value) => rax
-key => rdi
-*/
-
 bool fh_msg_queue_exists(long key) asm("_ZN4HPHP18f_msg_queue_existsEl");
 
-/*
-bool HPHP::f_msg_send(HPHP::Object const&, long, HPHP::Variant const&, bool, bool, HPHP::VRefParamValue const&)
-_ZN4HPHP10f_msg_sendERKNS_6ObjectElRKNS_7VariantEbbRKNS_14VRefParamValueE
-
-(return value) => rax
-queue => rdi
-msgtype => rsi
-message => rdx
-serialize => rcx
-blocking => r8
-errorcode => r9
-*/
-
-bool fh_msg_send(Value* queue, long msgtype, TypedValue* message, bool serialize, bool blocking, TypedValue* errorcode) asm("_ZN4HPHP10f_msg_sendERKNS_6ObjectElRKNS_7VariantEbbRKNS_14VRefParamValueE");
-
-/*
-bool HPHP::f_msg_receive(HPHP::Object const&, long, HPHP::VRefParamValue const&, long, HPHP::VRefParamValue const&, bool, long, HPHP::VRefParamValue const&)
-_ZN4HPHP13f_msg_receiveERKNS_6ObjectElRKNS_14VRefParamValueElS5_blS5_
-
-(return value) => rax
-queue => rdi
-desiredmsgtype => rsi
-msgtype => rdx
-maxsize => rcx
-message => r8
-unserialize => r9
-flags => st0
-errorcode => st8
-*/
-
-bool fh_msg_receive(Value* queue, long desiredmsgtype, TypedValue* msgtype, long maxsize, TypedValue* message, bool unserialize, long flags, TypedValue* errorcode) asm("_ZN4HPHP13f_msg_receiveERKNS_6ObjectElRKNS_14VRefParamValueElS5_blS5_");
-
-/*
-bool HPHP::f_msg_remove_queue(HPHP::Object const&)
-_ZN4HPHP18f_msg_remove_queueERKNS_6ObjectE
-
-(return value) => rax
-queue => rdi
-*/
-
 bool fh_msg_remove_queue(Value* queue) asm("_ZN4HPHP18f_msg_remove_queueERKNS_6ObjectE");
 
-/*
-bool HPHP::f_msg_set_queue(HPHP::Object const&, HPHP::Array const&)
-_ZN4HPHP15f_msg_set_queueERKNS_6ObjectERKNS_5ArrayE
-
-(return value) => rax
-queue => rdi
-data => rsi
-*/
-
 bool fh_msg_set_queue(Value* queue, Value* data) asm("_ZN4HPHP15f_msg_set_queueERKNS_6ObjectERKNS_5ArrayE");
 
-/*
-HPHP::Array HPHP::f_msg_stat_queue(HPHP::Object const&)
-_ZN4HPHP16f_msg_stat_queueERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-queue => rsi
-*/
-
 Value* fh_msg_stat_queue(Value* _rv, Value* queue) asm("_ZN4HPHP16f_msg_stat_queueERKNS_6ObjectE");
 
-/*
-bool HPHP::f_sem_acquire(HPHP::Object const&)
-_ZN4HPHP13f_sem_acquireERKNS_6ObjectE
+bool fh_msg_send(Value* queue, long msgtype, TypedValue* message, bool serialize, bool blocking, TypedValue* errorcode) asm("_ZN4HPHP10f_msg_sendERKNS_6ObjectElRKNS_7VariantEbbRKNS_14VRefParamValueE");
 
-(return value) => rax
-sem_identifier => rdi
-*/
+bool fh_msg_receive(Value* queue, long desiredmsgtype, TypedValue* msgtype, long maxsize, TypedValue* message, bool unserialize, long flags, TypedValue* errorcode) asm("_ZN4HPHP13f_msg_receiveERKNS_6ObjectElRKNS_14VRefParamValueElS5_blS5_");
 
 bool fh_sem_acquire(Value* sem_identifier) asm("_ZN4HPHP13f_sem_acquireERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_sem_get(long, long, long, bool)
-_ZN4HPHP9f_sem_getElllb
-
-(return value) => rax
-_rv => rdi
-key => rsi
-max_acquire => rdx
-perm => rcx
-auto_release => r8
-*/
+bool fh_sem_release(Value* sem_identifier) asm("_ZN4HPHP13f_sem_releaseERKNS_6ObjectE");
 
 TypedValue* fh_sem_get(TypedValue* _rv, long key, long max_acquire, long perm, bool auto_release) asm("_ZN4HPHP9f_sem_getElllb");
 
-/*
-bool HPHP::f_sem_release(HPHP::Object const&)
-_ZN4HPHP13f_sem_releaseERKNS_6ObjectE
-
-(return value) => rax
-sem_identifier => rdi
-*/
-
-bool fh_sem_release(Value* sem_identifier) asm("_ZN4HPHP13f_sem_releaseERKNS_6ObjectE");
-
-/*
-bool HPHP::f_sem_remove(HPHP::Object const&)
-_ZN4HPHP12f_sem_removeERKNS_6ObjectE
-
-(return value) => rax
-sem_identifier => rdi
-*/
-
 bool fh_sem_remove(Value* sem_identifier) asm("_ZN4HPHP12f_sem_removeERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_shm_attach(long, long, long)
-_ZN4HPHP12f_shm_attachElll
-
-(return value) => rax
-_rv => rdi
-shm_key => rsi
-shm_size => rdx
-shm_flag => rcx
-*/
-
 TypedValue* fh_shm_attach(TypedValue* _rv, long shm_key, long shm_size, long shm_flag) asm("_ZN4HPHP12f_shm_attachElll");
 
-/*
-bool HPHP::f_shm_detach(long)
-_ZN4HPHP12f_shm_detachEl
-
-(return value) => rax
-shm_identifier => rdi
-*/
-
 bool fh_shm_detach(long shm_identifier) asm("_ZN4HPHP12f_shm_detachEl");
 
-/*
-bool HPHP::f_shm_remove(long)
-_ZN4HPHP12f_shm_removeEl
-
-(return value) => rax
-shm_identifier => rdi
-*/
-
 bool fh_shm_remove(long shm_identifier) asm("_ZN4HPHP12f_shm_removeEl");
 
-/*
-HPHP::Variant HPHP::f_shm_get_var(long, long)
-_ZN4HPHP13f_shm_get_varEll
-
-(return value) => rax
-_rv => rdi
-shm_identifier => rsi
-variable_key => rdx
-*/
-
 TypedValue* fh_shm_get_var(TypedValue* _rv, long shm_identifier, long variable_key) asm("_ZN4HPHP13f_shm_get_varEll");
 
-/*
-bool HPHP::f_shm_has_var(long, long)
-_ZN4HPHP13f_shm_has_varEll
-
-(return value) => rax
-shm_identifier => rdi
-variable_key => rsi
-*/
-
 bool fh_shm_has_var(long shm_identifier, long variable_key) asm("_ZN4HPHP13f_shm_has_varEll");
 
-/*
-bool HPHP::f_shm_put_var(long, long, HPHP::Variant const&)
-_ZN4HPHP13f_shm_put_varEllRKNS_7VariantE
-
-(return value) => rax
-shm_identifier => rdi
-variable_key => rsi
-variable => rdx
-*/
-
 bool fh_shm_put_var(long shm_identifier, long variable_key, TypedValue* variable) asm("_ZN4HPHP13f_shm_put_varEllRKNS_7VariantE");
 
-/*
-bool HPHP::f_shm_remove_var(long, long)
-_ZN4HPHP16f_shm_remove_varEll
-
-(return value) => rax
-shm_identifier => rdi
-variable_key => rsi
-*/
-
 bool fh_shm_remove_var(long shm_identifier, long variable_key) asm("_ZN4HPHP16f_shm_remove_varEll");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_iterator.ext_hhvm.h

@@ -16,299 +16,60 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Object HPHP::f_hphp_recursiveiteratoriterator___construct(HPHP::Object const&, HPHP::Object const&, long, long)
-_ZN4HPHP44f_hphp_recursiveiteratoriterator___constructERKNS_6ObjectES2_ll
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-iterator => rdx
-mode => rcx
-flags => r8
-*/
-
 Value* fh_hphp_recursiveiteratoriterator___construct(Value* _rv, Value* obj, Value* iterator, long mode, long flags) asm("_ZN4HPHP44f_hphp_recursiveiteratoriterator___constructERKNS_6ObjectES2_ll");
 
-/*
-HPHP::Object HPHP::f_hphp_recursiveiteratoriterator_getinneriterator(HPHP::Object const&)
-_ZN4HPHP49f_hphp_recursiveiteratoriterator_getinneriteratorERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 Value* fh_hphp_recursiveiteratoriterator_getinneriterator(Value* _rv, Value* obj) asm("_ZN4HPHP49f_hphp_recursiveiteratoriterator_getinneriteratorERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_hphp_recursiveiteratoriterator_current(HPHP::Object const&)
-_ZN4HPHP40f_hphp_recursiveiteratoriterator_currentERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_hphp_recursiveiteratoriterator_current(TypedValue* _rv, Value* obj) asm("_ZN4HPHP40f_hphp_recursiveiteratoriterator_currentERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_hphp_recursiveiteratoriterator_key(HPHP::Object const&)
-_ZN4HPHP36f_hphp_recursiveiteratoriterator_keyERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
-TypedValue* fh_hphp_recursiveiteratoriterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP36f_hphp_recursiveiteratoriterator_keyERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_recursiveiteratoriterator_next(HPHP::Object const&)
-_ZN4HPHP37f_hphp_recursiveiteratoriterator_nextERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_recursiveiteratoriterator_next(Value* obj) asm("_ZN4HPHP37f_hphp_recursiveiteratoriterator_nextERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_recursiveiteratoriterator_rewind(HPHP::Object const&)
-_ZN4HPHP39f_hphp_recursiveiteratoriterator_rewindERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_recursiveiteratoriterator_rewind(Value* obj) asm("_ZN4HPHP39f_hphp_recursiveiteratoriterator_rewindERKNS_6ObjectE");
-
-/*
-bool HPHP::f_hphp_recursiveiteratoriterator_valid(HPHP::Object const&)
-_ZN4HPHP38f_hphp_recursiveiteratoriterator_validERKNS_6ObjectE
-
-(return value) => rax
-obj => rdi
-*/
-
-bool fh_hphp_recursiveiteratoriterator_valid(Value* obj) asm("_ZN4HPHP38f_hphp_recursiveiteratoriterator_validERKNS_6ObjectE");
-
-/*
-bool HPHP::f_hphp_directoryiterator___construct(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP36f_hphp_directoryiterator___constructERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-obj => rdi
-path => rsi
-*/
-
-bool fh_hphp_directoryiterator___construct(Value* obj, Value* path) asm("_ZN4HPHP36f_hphp_directoryiterator___constructERKNS_6ObjectERKNS_6StringE");
-
-/*
-HPHP::Variant HPHP::f_hphp_directoryiterator_key(HPHP::Object const&)
-_ZN4HPHP28f_hphp_directoryiterator_keyERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
-TypedValue* fh_hphp_directoryiterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP28f_hphp_directoryiterator_keyERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_directoryiterator_next(HPHP::Object const&)
-_ZN4HPHP29f_hphp_directoryiterator_nextERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_directoryiterator_next(Value* obj) asm("_ZN4HPHP29f_hphp_directoryiterator_nextERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_directoryiterator_rewind(HPHP::Object const&)
-_ZN4HPHP31f_hphp_directoryiterator_rewindERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_directoryiterator_rewind(Value* obj) asm("_ZN4HPHP31f_hphp_directoryiterator_rewindERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_directoryiterator_seek(HPHP::Object const&, long)
-_ZN4HPHP29f_hphp_directoryiterator_seekERKNS_6ObjectEl
-
-obj => rdi
-position => rsi
-*/
-
-void fh_hphp_directoryiterator_seek(Value* obj, long position) asm("_ZN4HPHP29f_hphp_directoryiterator_seekERKNS_6ObjectEl");
-
-/*
-HPHP::Variant HPHP::f_hphp_directoryiterator_current(HPHP::Object const&)
-_ZN4HPHP32f_hphp_directoryiterator_currentERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
-TypedValue* fh_hphp_directoryiterator_current(TypedValue* _rv, Value* obj) asm("_ZN4HPHP32f_hphp_directoryiterator_currentERKNS_6ObjectE");
-
-/*
-HPHP::String HPHP::f_hphp_directoryiterator___tostring(HPHP::Object const&)
-_ZN4HPHP35f_hphp_directoryiterator___tostringERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
-Value* fh_hphp_directoryiterator___tostring(Value* _rv, Value* obj) asm("_ZN4HPHP35f_hphp_directoryiterator___tostringERKNS_6ObjectE");
-
-/*
-bool HPHP::f_hphp_directoryiterator_valid(HPHP::Object const&)
-_ZN4HPHP30f_hphp_directoryiterator_validERKNS_6ObjectE
-
-(return value) => rax
-obj => rdi
-*/
-
-bool fh_hphp_directoryiterator_valid(Value* obj) asm("_ZN4HPHP30f_hphp_directoryiterator_validERKNS_6ObjectE");
-
-/*
-bool HPHP::f_hphp_directoryiterator_isdot(HPHP::Object const&)
-_ZN4HPHP30f_hphp_directoryiterator_isdotERKNS_6ObjectE
-
-(return value) => rax
-obj => rdi
-*/
-
-bool fh_hphp_directoryiterator_isdot(Value* obj) asm("_ZN4HPHP30f_hphp_directoryiterator_isdotERKNS_6ObjectE");
-
-/*
-bool HPHP::f_hphp_recursivedirectoryiterator___construct(HPHP::Object const&, HPHP::String const&, long)
-_ZN4HPHP45f_hphp_recursivedirectoryiterator___constructERKNS_6ObjectERKNS_6StringEl
-
-(return value) => rax
-obj => rdi
-path => rsi
-flags => rdx
-*/
-
-bool fh_hphp_recursivedirectoryiterator___construct(Value* obj, Value* path, long flags) asm("_ZN4HPHP45f_hphp_recursivedirectoryiterator___constructERKNS_6ObjectERKNS_6StringEl");
-
-/*
-HPHP::Variant HPHP::f_hphp_recursivedirectoryiterator_key(HPHP::Object const&)
-_ZN4HPHP37f_hphp_recursivedirectoryiterator_keyERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
-TypedValue* fh_hphp_recursivedirectoryiterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP37f_hphp_recursivedirectoryiterator_keyERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_recursivedirectoryiterator_next(HPHP::Object const&)
-_ZN4HPHP38f_hphp_recursivedirectoryiterator_nextERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_recursivedirectoryiterator_next(Value* obj) asm("_ZN4HPHP38f_hphp_recursivedirectoryiterator_nextERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_recursivedirectoryiterator_rewind(HPHP::Object const&)
-_ZN4HPHP40f_hphp_recursivedirectoryiterator_rewindERKNS_6ObjectE
-
-obj => rdi
-*/
-
-void fh_hphp_recursivedirectoryiterator_rewind(Value* obj) asm("_ZN4HPHP40f_hphp_recursivedirectoryiterator_rewindERKNS_6ObjectE");
-
-/*
-void HPHP::f_hphp_recursivedirectoryiterator_seek(HPHP::Object const&, long)
-_ZN4HPHP38f_hphp_recursivedirectoryiterator_seekERKNS_6ObjectEl
-
-obj => rdi
-position => rsi
-*/
-
-void fh_hphp_recursivedirectoryiterator_seek(Value* obj, long position) asm("_ZN4HPHP38f_hphp_recursivedirectoryiterator_seekERKNS_6ObjectEl");
-
-/*
-HPHP::Variant HPHP::f_hphp_recursivedirectoryiterator_current(HPHP::Object const&)
-_ZN4HPHP41f_hphp_recursivedirectoryiterator_currentERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 TypedValue* fh_hphp_recursivedirectoryiterator_current(TypedValue* _rv, Value* obj) asm("_ZN4HPHP41f_hphp_recursivedirectoryiterator_currentERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_hphp_recursivedirectoryiterator___tostring(HPHP::Object const&)
-_ZN4HPHP44f_hphp_recursivedirectoryiterator___tostringERKNS_6ObjectE
+TypedValue* fh_hphp_recursiveiteratoriterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP36f_hphp_recursiveiteratoriterator_keyERKNS_6ObjectE");
 
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
+TypedValue* fh_hphp_recursivedirectoryiterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP37f_hphp_recursivedirectoryiterator_keyERKNS_6ObjectE");
+
+void fh_hphp_recursiveiteratoriterator_next(Value* obj) asm("_ZN4HPHP37f_hphp_recursiveiteratoriterator_nextERKNS_6ObjectE");
+
+bool fh_hphp_recursiveiteratoriterator_valid(Value* obj) asm("_ZN4HPHP38f_hphp_recursiveiteratoriterator_validERKNS_6ObjectE");
+
+void fh_hphp_recursiveiteratoriterator_rewind(Value* obj) asm("_ZN4HPHP39f_hphp_recursiveiteratoriterator_rewindERKNS_6ObjectE");
+
+void fh_hphp_recursivedirectoryiterator_rewind(Value* obj) asm("_ZN4HPHP40f_hphp_recursivedirectoryiterator_rewindERKNS_6ObjectE");
+
+bool fh_hphp_directoryiterator___construct(Value* obj, Value* path) asm("_ZN4HPHP36f_hphp_directoryiterator___constructERKNS_6ObjectERKNS_6StringE");
+
+TypedValue* fh_hphp_directoryiterator_key(TypedValue* _rv, Value* obj) asm("_ZN4HPHP28f_hphp_directoryiterator_keyERKNS_6ObjectE");
+
+void fh_hphp_directoryiterator_next(Value* obj) asm("_ZN4HPHP29f_hphp_directoryiterator_nextERKNS_6ObjectE");
+
+void fh_hphp_directoryiterator_rewind(Value* obj) asm("_ZN4HPHP31f_hphp_directoryiterator_rewindERKNS_6ObjectE");
+
+void fh_hphp_directoryiterator_seek(Value* obj, long position) asm("_ZN4HPHP29f_hphp_directoryiterator_seekERKNS_6ObjectEl");
+
+TypedValue* fh_hphp_directoryiterator_current(TypedValue* _rv, Value* obj) asm("_ZN4HPHP32f_hphp_directoryiterator_currentERKNS_6ObjectE");
+
+Value* fh_hphp_directoryiterator___tostring(Value* _rv, Value* obj) asm("_ZN4HPHP35f_hphp_directoryiterator___tostringERKNS_6ObjectE");
+
+bool fh_hphp_directoryiterator_valid(Value* obj) asm("_ZN4HPHP30f_hphp_directoryiterator_validERKNS_6ObjectE");
+
+bool fh_hphp_directoryiterator_isdot(Value* obj) asm("_ZN4HPHP30f_hphp_directoryiterator_isdotERKNS_6ObjectE");
+
+bool fh_hphp_recursivedirectoryiterator___construct(Value* obj, Value* path, long flags) asm("_ZN4HPHP45f_hphp_recursivedirectoryiterator___constructERKNS_6ObjectERKNS_6StringEl");
+
+void fh_hphp_recursivedirectoryiterator_next(Value* obj) asm("_ZN4HPHP38f_hphp_recursivedirectoryiterator_nextERKNS_6ObjectE");
+
+void fh_hphp_recursivedirectoryiterator_seek(Value* obj, long position) asm("_ZN4HPHP38f_hphp_recursivedirectoryiterator_seekERKNS_6ObjectEl");
 
 Value* fh_hphp_recursivedirectoryiterator___tostring(Value* _rv, Value* obj) asm("_ZN4HPHP44f_hphp_recursivedirectoryiterator___tostringERKNS_6ObjectE");
 
-/*
-bool HPHP::f_hphp_recursivedirectoryiterator_valid(HPHP::Object const&)
-_ZN4HPHP39f_hphp_recursivedirectoryiterator_validERKNS_6ObjectE
-
-(return value) => rax
-obj => rdi
-*/
-
 bool fh_hphp_recursivedirectoryiterator_valid(Value* obj) asm("_ZN4HPHP39f_hphp_recursivedirectoryiterator_validERKNS_6ObjectE");
 
-/*
-bool HPHP::f_hphp_recursivedirectoryiterator_haschildren(HPHP::Object const&)
-_ZN4HPHP45f_hphp_recursivedirectoryiterator_haschildrenERKNS_6ObjectE
-
-(return value) => rax
-obj => rdi
-*/
-
 bool fh_hphp_recursivedirectoryiterator_haschildren(Value* obj) asm("_ZN4HPHP45f_hphp_recursivedirectoryiterator_haschildrenERKNS_6ObjectE");
 
-/*
-HPHP::Object HPHP::f_hphp_recursivedirectoryiterator_getchildren(HPHP::Object const&)
-_ZN4HPHP45f_hphp_recursivedirectoryiterator_getchildrenERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 Value* fh_hphp_recursivedirectoryiterator_getchildren(Value* _rv, Value* obj) asm("_ZN4HPHP45f_hphp_recursivedirectoryiterator_getchildrenERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_hphp_recursivedirectoryiterator_getsubpath(HPHP::Object const&)
-_ZN4HPHP44f_hphp_recursivedirectoryiterator_getsubpathERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 Value* fh_hphp_recursivedirectoryiterator_getsubpath(Value* _rv, Value* obj) asm("_ZN4HPHP44f_hphp_recursivedirectoryiterator_getsubpathERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_hphp_recursivedirectoryiterator_getsubpathname(HPHP::Object const&)
-_ZN4HPHP48f_hphp_recursivedirectoryiterator_getsubpathnameERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-obj => rsi
-*/
-
 Value* fh_hphp_recursivedirectoryiterator_getsubpathname(Value* _rv, Value* obj) asm("_ZN4HPHP48f_hphp_recursivedirectoryiterator_getsubpathnameERKNS_6ObjectE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_json.ext_hhvm.cpp

@@ -14,68 +14,43 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <runtime/ext_hhvm/ext_hhvm.h>
-#include <runtime/base/builtin_functions.h>
-#include <runtime/base/array/array_init.h>
-#include <runtime/ext/ext.h>
-#include <runtime/vm/class.h>
-#include <runtime/vm/runtime.h>
+
+#include "runtime/ext_hhvm/ext_hhvm.h"
+#include "runtime/base/builtin_functions.h"
+#include "runtime/base/array/array_init.h"
+#include "runtime/ext/ext.h"
+#include "runtime/vm/class.h"
+#include "runtime/vm/runtime.h"
 #include <exception>
 
 namespace HPHP {
 
-/*
-HPHP::String HPHP::f_json_encode(HPHP::Variant const&, HPHP::Variant const&)
-_ZN4HPHP13f_json_encodeERKNS_7VariantES2_
-
-(return value) => rax
-_rv => rdi
-value => rsi
-options => rdx
-*/
-
 Value* fh_json_encode(Value* _rv, TypedValue* value, TypedValue* options) asm("_ZN4HPHP13f_json_encodeERKNS_7VariantES2_");
 
-TypedValue* fg_json_encode(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 2LL) {
-      rv.m_type = KindOfString;
-      Variant defVal1 = 0;
-      fh_json_encode((&rv.m_data), (args-0), (count > 1) ? (args-1) : (TypedValue*)(&defVal1));
-      if (rv.m_data.num == 0LL) rv.m_type = KindOfNull;
-      frame_free_locals_no_this_inl(ar, 2);
-      memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-      return &ar->m_r;
-    } else {
-      throw_wrong_arguments_nr("json_encode", count, 1, 2, 1);
-    }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 2);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+TypedValue* fg_json_encode(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 2) {
+    rv->m_type = KindOfString;
+    Variant defVal1 = 0;
+    fh_json_encode(&(rv->m_data), (args-0), (count > 1) ? (args-1) : (TypedValue*)(&defVal1));
+    if (rv->m_data.num == 0LL) rv->m_type = KindOfNull;
+  } else {
+    throw_wrong_arguments_nr("json_encode", count, 1, 2, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 2);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-/*
-HPHP::Variant HPHP::f_json_decode(HPHP::String const&, bool, HPHP::Variant const&)
-_ZN4HPHP13f_json_decodeERKNS_6StringEbRKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-json => rsi
-assoc => rdx
-options => rcx
-*/
-
 TypedValue* fh_json_decode(TypedValue* _rv, Value* json, bool assoc, TypedValue* options) asm("_ZN4HPHP13f_json_decodeERKNS_6StringEbRKNS_7VariantE");
 
-TypedValue * fg1_json_decode(TypedValue* rv, ActRec* ar, int64_t count) __attribute__((noinline,cold));
-TypedValue * fg1_json_decode(TypedValue* rv, ActRec* ar, int64_t count) {
+void fg1_json_decode(TypedValue* rv, ActRec* ar, int32_t count) __attribute__((noinline,cold));
+void fg1_json_decode(TypedValue* rv, ActRec* ar, int32_t count) {
   TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
   switch (count) {
   default: // count >= 3
@@ -90,42 +65,32 @@ TypedValue * fg1_json_decode(TypedValue* rv, ActRec* ar, int64_t count) {
     tvCastToStringInPlace(args-0);
   }
   Variant defVal2 = 0;
-  fh_json_decode((rv), &args[-0].m_data, (count > 1) ? (bool)(args[-1].m_data.num) : (bool)(false), (count > 2) ? (args-2) : (TypedValue*)(&defVal2));
+  fh_json_decode(rv, &args[-0].m_data, (count > 1) ? (bool)(args[-1].m_data.num) : (bool)(false), (count > 2) ? (args-2) : (TypedValue*)(&defVal2));
   if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
-  return rv;
 }
 
-TypedValue* fg_json_decode(ActRec *ar) {
-    TypedValue rv;
-    int64_t count = ar->numArgs();
-    TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
-    if (count >= 1LL && count <= 3LL) {
-      if ((count <= 1 || (args-1)->m_type == KindOfBoolean) && IS_STRING_TYPE((args-0)->m_type)) {
-        Variant defVal2 = 0;
-        fh_json_decode((&(rv)), &args[-0].m_data, (count > 1) ? (bool)(args[-1].m_data.num) : (bool)(false), (count > 2) ? (args-2) : (TypedValue*)(&defVal2));
-        if (rv.m_type == KindOfUninit) rv.m_type = KindOfNull;
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      } else {
-        fg1_json_decode(&rv, ar, count);
-        frame_free_locals_no_this_inl(ar, 3);
-        memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-        return &ar->m_r;
-      }
+TypedValue* fg_json_decode(ActRec* ar) {
+  TypedValue rvSpace;
+  TypedValue* rv = &rvSpace;
+  int32_t count = ar->numArgs();
+  TypedValue* args UNUSED = ((TypedValue*)ar) - 1;
+  if (count >= 1 && count <= 3) {
+    if ((count <= 1 || (args - 1)->m_type == KindOfBoolean) &&
+        IS_STRING_TYPE((args - 0)->m_type)) {
+      Variant defVal2 = 0;
+      fh_json_decode(rv, &args[-0].m_data, (count > 1) ? (bool)(args[-1].m_data.num) : (bool)(false), (count > 2) ? (args-2) : (TypedValue*)(&defVal2));
+      if (rv->m_type == KindOfUninit) rv->m_type = KindOfNull;
     } else {
-      throw_wrong_arguments_nr("json_decode", count, 1, 3, 1);
+      fg1_json_decode(rv, ar, count);
     }
-    rv.m_data.num = 0LL;
-    rv.m_type = KindOfNull;
-    frame_free_locals_no_this_inl(ar, 3);
-    memcpy(&ar->m_r, &rv, sizeof(TypedValue));
-    return &ar->m_r;
+  } else {
+    throw_wrong_arguments_nr("json_decode", count, 1, 3, 1);
+    rv->m_data.num = 0LL;
+    rv->m_type = KindOfNull;
+  }
+  frame_free_locals_no_this_inl(ar, 3);
+  memcpy(&ar->m_r, rv, sizeof(TypedValue));
   return &ar->m_r;
 }
 
-
-
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_json.ext_hhvm.h

@@ -16,31 +16,8 @@
 */
 namespace HPHP {
 
-/*
-HPHP::String HPHP::f_json_encode(HPHP::Variant const&, HPHP::Variant const&)
-_ZN4HPHP13f_json_encodeERKNS_7VariantES2_
-
-(return value) => rax
-_rv => rdi
-value => rsi
-options => rdx
-*/
-
 Value* fh_json_encode(Value* _rv, TypedValue* value, TypedValue* options) asm("_ZN4HPHP13f_json_encodeERKNS_7VariantES2_");
 
-/*
-HPHP::Variant HPHP::f_json_decode(HPHP::String const&, bool, HPHP::Variant const&)
-_ZN4HPHP13f_json_decodeERKNS_6StringEbRKNS_7VariantE
-
-(return value) => rax
-_rv => rdi
-json => rsi
-assoc => rdx
-options => rcx
-*/
-
 TypedValue* fh_json_decode(TypedValue* _rv, Value* json, bool assoc, TypedValue* options) asm("_ZN4HPHP13f_json_decodeERKNS_6StringEbRKNS_7VariantE");
 
-
-} // !HPHP
-
+} // namespace HPHP

hphp/runtime/ext/ext_ldap.ext_hhvm.h

@@ -16,497 +16,84 @@
 */
 namespace HPHP {
 
-/*
-HPHP::Variant HPHP::f_ldap_connect(HPHP::String const&, int)
-_ZN4HPHP14f_ldap_connectERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-hostname => rsi
-port => rdx
-*/
-
 TypedValue* fh_ldap_connect(TypedValue* _rv, Value* hostname, int port) asm("_ZN4HPHP14f_ldap_connectERKNS_6StringEi");
 
-/*
-HPHP::Variant HPHP::f_ldap_explode_dn(HPHP::String const&, int)
-_ZN4HPHP17f_ldap_explode_dnERKNS_6StringEi
-
-(return value) => rax
-_rv => rdi
-dn => rsi
-with_attrib => rdx
-*/
-
 TypedValue* fh_ldap_explode_dn(TypedValue* _rv, Value* dn, int with_attrib) asm("_ZN4HPHP17f_ldap_explode_dnERKNS_6StringEi");
 
-/*
-HPHP::Variant HPHP::f_ldap_dn2ufn(HPHP::String const&)
-_ZN4HPHP13f_ldap_dn2ufnERKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-db => rsi
-*/
-
 TypedValue* fh_ldap_dn2ufn(TypedValue* _rv, Value* db) asm("_ZN4HPHP13f_ldap_dn2ufnERKNS_6StringE");
 
-/*
-HPHP::String HPHP::f_ldap_err2str(int)
-_ZN4HPHP14f_ldap_err2strEi
-
-(return value) => rax
-_rv => rdi
-errnum => rsi
-*/
-
 Value* fh_ldap_err2str(Value* _rv, int errnum) asm("_ZN4HPHP14f_ldap_err2strEi");
 
-/*
-bool HPHP::f_ldap_add(HPHP::Object const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP10f_ldap_addERKNS_6ObjectERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-link => rdi
-dn => rsi
-entry => rdx
-*/
-
 bool fh_ldap_add(Value* link, Value* dn, Value* entry) asm("_ZN4HPHP10f_ldap_addERKNS_6ObjectERKNS_6StringERKNS_5ArrayE");
 
-/*
-bool HPHP::f_ldap_mod_add(HPHP::Object const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP14f_ldap_mod_addERKNS_6ObjectERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-link => rdi
-dn => rsi
-entry => rdx
-*/
-
 bool fh_ldap_mod_add(Value* link, Value* dn, Value* entry) asm("_ZN4HPHP14f_ldap_mod_addERKNS_6ObjectERKNS_6StringERKNS_5ArrayE");
 
-/*
-bool HPHP::f_ldap_mod_del(HPHP::Object const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP14f_ldap_mod_delERKNS_6ObjectERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-link => rdi
-dn => rsi
-entry => rdx
-*/
-
 bool fh_ldap_mod_del(Value* link, Value* dn, Value* entry) asm("_ZN4HPHP14f_ldap_mod_delERKNS_6ObjectERKNS_6StringERKNS_5ArrayE");
 
-/*
-bool HPHP::f_ldap_mod_replace(HPHP::Object const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP18f_ldap_mod_replaceERKNS_6ObjectERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-link => rdi
-dn => rsi
-entry => rdx
-*/
-
 bool fh_ldap_mod_replace(Value* link, Value* dn, Value* entry) asm("_ZN4HPHP18f_ldap_mod_replaceERKNS_6ObjectERKNS_6StringERKNS_5ArrayE");
 
-/*
-bool HPHP::f_ldap_modify(HPHP::Object const&, HPHP::String const&, HPHP::Array const&)
-_ZN4HPHP13f_ldap_modifyERKNS_6ObjectERKNS_6StringERKNS_5ArrayE
-
-(return value) => rax
-link => rdi
-dn => rsi
-entry => rdx
-*/
-
 bool fh_ldap_modify(Value* link, Value* dn, Value* entry) asm("_ZN4HPHP13f_ldap_modifyERKNS_6ObjectERKNS_6StringERKNS_5ArrayE");
 
-/*
-bool HPHP::f_ldap_bind(HPHP::Object const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP11f_ldap_bindERKNS_6ObjectERKNS_6StringES5_
-
-(return value) => rax
-link => rdi
-bind_rdn => rsi
-bind_password => rdx
-*/
-
 bool fh_ldap_bind(Value* link, Value* bind_rdn, Value* bind_password) asm("_ZN4HPHP11f_ldap_bindERKNS_6ObjectERKNS_6StringES5_");
 
-/*
-bool HPHP::f_ldap_set_rebind_proc(HPHP::Object const&, HPHP::Variant const&)
-_ZN4HPHP22f_ldap_set_rebind_procERKNS_6ObjectERKNS_7VariantE
-
-(return value) => rax
-link => rdi
-callback => rsi
-*/
-
 bool fh_ldap_set_rebind_proc(Value* link, TypedValue* callback) asm("_ZN4HPHP22f_ldap_set_rebind_procERKNS_6ObjectERKNS_7VariantE");
 
-/*
-bool HPHP::f_ldap_sort(HPHP::Object const&, HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP11f_ldap_sortERKNS_6ObjectES2_RKNS_6StringE
-
-(return value) => rax
-link => rdi
-result => rsi
-sortfilter => rdx
-*/
-
 bool fh_ldap_sort(Value* link, Value* result, Value* sortfilter) asm("_ZN4HPHP11f_ldap_sortERKNS_6ObjectES2_RKNS_6StringE");
 
-/*
-bool HPHP::f_ldap_start_tls(HPHP::Object const&)
-_ZN4HPHP16f_ldap_start_tlsERKNS_6ObjectE
-
-(return value) => rax
-link => rdi
-*/
-
 bool fh_ldap_start_tls(Value* link) asm("_ZN4HPHP16f_ldap_start_tlsERKNS_6ObjectE");
 
-/*
-bool HPHP::f_ldap_unbind(HPHP::Object const&)
-_ZN4HPHP13f_ldap_unbindERKNS_6ObjectE
-
-(return value) => rax
-link => rdi
-*/
-
 bool fh_ldap_unbind(Value* link) asm("_ZN4HPHP13f_ldap_unbindERKNS_6ObjectE");
 
-/*
-bool HPHP::f_ldap_get_option(HPHP::Object const&, int, HPHP::VRefParamValue const&)
-_ZN4HPHP17f_ldap_get_optionERKNS_6ObjectEiRKNS_14VRefParamValueE
-
-(return value) => rax
-link => rdi
-option => rsi
-retval => rdx
-*/
-
 bool fh_ldap_get_option(Value* link, int option, TypedValue* retval) asm("_ZN4HPHP17f_ldap_get_optionERKNS_6ObjectEiRKNS_14VRefParamValueE");
 
-/*
-bool HPHP::f_ldap_set_option(HPHP::Variant const&, int, HPHP::Variant const&)
-_ZN4HPHP17f_ldap_set_optionERKNS_7VariantEiS2_
-
-(return value) => rax
-link => rdi
-option => rsi
-newval => rdx
-*/
-
 bool fh_ldap_set_option(TypedValue* link, int option, TypedValue* newval) asm("_ZN4HPHP17f_ldap_set_optionERKNS_7VariantEiS2_");
 
-/*
-bool HPHP::f_ldap_close(HPHP::Object const&)
-_ZN4HPHP12f_ldap_closeERKNS_6ObjectE
-
-(return value) => rax
-link => rdi
-*/
-
 bool fh_ldap_close(Value* link) asm("_ZN4HPHP12f_ldap_closeERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_ldap_list(HPHP::Variant const&, HPHP::Variant const&, HPHP::Variant const&, HPHP::Array const&, int, int, int, int)
-_ZN4HPHP11f_ldap_listERKNS_7VariantES2_S2_RKNS_5ArrayEiiii
-
-(return value) => rax
-_rv => rdi
-link => rsi
-base_dn => rdx
-filter => rcx
-attributes => r8
-attrsonly => r9
-sizelimit => st0
-timelimit => st8
-deref => st16
-*/
-
 TypedValue* fh_ldap_list(TypedValue* _rv, TypedValue* link, TypedValue* base_dn, TypedValue* filter, Value* attributes, int attrsonly, int sizelimit, int timelimit, int deref) asm("_ZN4HPHP11f_ldap_listERKNS_7VariantES2_S2_RKNS_5ArrayEiiii");
 
-/*
-HPHP::Variant HPHP::f_ldap_read(HPHP::Variant const&, HPHP::Variant const&, HPHP::Variant const&, HPHP::Array const&, int, int, int, int)
-_ZN4HPHP11f_ldap_readERKNS_7VariantES2_S2_RKNS_5ArrayEiiii
-
-(return value) => rax
-_rv => rdi
-link => rsi
-base_dn => rdx
-filter => rcx
-attributes => r8
-attrsonly => r9
-sizelimit => st0
-timelimit => st8
-deref => st16
-*/
-
 TypedValue* fh_ldap_read(TypedValue* _rv, TypedValue* link, TypedValue* base_dn, TypedValue* filter, Value* attributes, int attrsonly, int sizelimit, int timelimit, int deref) asm("_ZN4HPHP11f_ldap_readERKNS_7VariantES2_S2_RKNS_5ArrayEiiii");
 
-/*
-HPHP::Variant HPHP::f_ldap_search(HPHP::Variant const&, HPHP::Variant const&, HPHP::Variant const&, HPHP::Array const&, int, int, int, int)
-_ZN4HPHP13f_ldap_searchERKNS_7VariantES2_S2_RKNS_5ArrayEiiii
-
-(return value) => rax
-_rv => rdi
-link => rsi
-base_dn => rdx
-filter => rcx
-attributes => r8
-attrsonly => r9
-sizelimit => st0
-timelimit => st8
-deref => st16
-*/
-
 TypedValue* fh_ldap_search(TypedValue* _rv, TypedValue* link, TypedValue* base_dn, TypedValue* filter, Value* attributes, int attrsonly, int sizelimit, int timelimit, int deref) asm("_ZN4HPHP13f_ldap_searchERKNS_7VariantES2_S2_RKNS_5ArrayEiiii");
 
-/*
-bool HPHP::f_ldap_rename(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&, bool)
-_ZN4HPHP13f_ldap_renameERKNS_6ObjectERKNS_6StringES5_S5_b
-
-(return value) => rax
-link => rdi
-dn => rsi
-newrdn => rdx
-newparent => rcx
-deleteoldrdn => r8
-*/
-
 bool fh_ldap_rename(Value* link, Value* dn, Value* newrdn, Value* newparent, bool deleteoldrdn) asm("_ZN4HPHP13f_ldap_renameERKNS_6ObjectERKNS_6StringES5_S5_b");
 
-/*
-bool HPHP::f_ldap_delete(HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP13f_ldap_deleteERKNS_6ObjectERKNS_6StringE
-
-(return value) => rax
-link => rdi
-dn => rsi
-*/
-
 bool fh_ldap_delete(Value* link, Value* dn) asm("_ZN4HPHP13f_ldap_deleteERKNS_6ObjectERKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_ldap_compare(HPHP::Object const&, HPHP::String const&, HPHP::String const&, HPHP::String const&)
-_ZN4HPHP14f_ldap_compareERKNS_6ObjectERKNS_6StringES5_S5_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-dn => rdx
-attribute => rcx
-value => r8
-*/
-
 TypedValue* fh_ldap_compare(TypedValue* _rv, Value* link, Value* dn, Value* attribute, Value* value) asm("_ZN4HPHP14f_ldap_compareERKNS_6ObjectERKNS_6StringES5_S5_");
 
-/*
-long HPHP::f_ldap_errno(HPHP::Object const&)
-_ZN4HPHP12f_ldap_errnoERKNS_6ObjectE
-
-(return value) => rax
-link => rdi
-*/
-
 long fh_ldap_errno(Value* link) asm("_ZN4HPHP12f_ldap_errnoERKNS_6ObjectE");
 
-/*
-HPHP::String HPHP::f_ldap_error(HPHP::Object const&)
-_ZN4HPHP12f_ldap_errorERKNS_6ObjectE
-
-(return value) => rax
-_rv => rdi
-link => rsi
-*/
-
 Value* fh_ldap_error(Value* _rv, Value* link) asm("_ZN4HPHP12f_ldap_errorERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_ldap_get_dn(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP13f_ldap_get_dnERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 TypedValue* fh_ldap_get_dn(TypedValue* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP13f_ldap_get_dnERKNS_6ObjectES2_");
 
-/*
-long HPHP::f_ldap_count_entries(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP20f_ldap_count_entriesERKNS_6ObjectES2_
-
-(return value) => rax
-link => rdi
-result => rsi
-*/
-
 long fh_ldap_count_entries(Value* link, Value* result) asm("_ZN4HPHP20f_ldap_count_entriesERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_get_entries(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP18f_ldap_get_entriesERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result => rdx
-*/
-
 TypedValue* fh_ldap_get_entries(TypedValue* _rv, Value* link, Value* result) asm("_ZN4HPHP18f_ldap_get_entriesERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_first_entry(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP18f_ldap_first_entryERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result => rdx
-*/
-
 TypedValue* fh_ldap_first_entry(TypedValue* _rv, Value* link, Value* result) asm("_ZN4HPHP18f_ldap_first_entryERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_next_entry(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP17f_ldap_next_entryERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 TypedValue* fh_ldap_next_entry(TypedValue* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP17f_ldap_next_entryERKNS_6ObjectES2_");
 
-/*
-HPHP::Array HPHP::f_ldap_get_attributes(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP21f_ldap_get_attributesERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 Value* fh_ldap_get_attributes(Value* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP21f_ldap_get_attributesERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_first_attribute(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP22f_ldap_first_attributeERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 TypedValue* fh_ldap_first_attribute(TypedValue* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP22f_ldap_first_attributeERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_next_attribute(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP21f_ldap_next_attributeERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 TypedValue* fh_ldap_next_attribute(TypedValue* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP21f_ldap_next_attributeERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_first_reference(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP22f_ldap_first_referenceERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result => rdx
-*/
-
 TypedValue* fh_ldap_first_reference(TypedValue* _rv, Value* link, Value* result) asm("_ZN4HPHP22f_ldap_first_referenceERKNS_6ObjectES2_");
 
-/*
-HPHP::Variant HPHP::f_ldap_next_reference(HPHP::Object const&, HPHP::Object const&)
-_ZN4HPHP21f_ldap_next_referenceERKNS_6ObjectES2_
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-*/
-
 TypedValue* fh_ldap_next_reference(TypedValue* _rv, Value* link, Value* result_entry) asm("_ZN4HPHP21f_ldap_next_referenceERKNS_6ObjectES2_");
 
-/*
-bool HPHP::f_ldap_parse_reference(HPHP::Object const&, HPHP::Object const&, HPHP::VRefParamValue const&)
-_ZN4HPHP22f_ldap_parse_referenceERKNS_6ObjectES2_RKNS_14VRefParamValueE
-
-(return value) => rax
-link => rdi
-result_entry => rsi
-referrals => rdx
-*/
-
 bool fh_ldap_parse_reference(Value* link, Value* result_entry, TypedValue* referrals) asm("_ZN4HPHP22f_ldap_parse_referenceERKNS_6ObjectES2_RKNS_14VRefParamValueE");
 
-/*
-bool HPHP::f_ldap_parse_result(HPHP::Object const&, HPHP::Object const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&, HPHP::VRefParamValue const&)
-_ZN4HPHP19f_ldap_parse_resultERKNS_6ObjectES2_RKNS_14VRefParamValueES5_S5_S5_
-
-(return value) => rax
-link => rdi
-result => rsi
-errcode => rdx
-matcheddn => rcx
-errmsg => r8
-referrals => r9
-*/
-
 bool fh_ldap_parse_result(Value* link, Value* result, TypedValue* errcode, TypedValue* matcheddn, TypedValue* errmsg, TypedValue* referrals) asm("_ZN4HPHP19f_ldap_parse_resultERKNS_6ObjectES2_RKNS_14VRefParamValueES5_S5_S5_");
 
-/*
-bool HPHP::f_ldap_free_result(HPHP::Object const&)
-_ZN4HPHP18f_ldap_free_resultERKNS_6ObjectE
-
-(return value) => rax
-result => rdi
-*/
-
 bool fh_ldap_free_result(Value* result) asm("_ZN4HPHP18f_ldap_free_resultERKNS_6ObjectE");
 
-/*
-HPHP::Variant HPHP::f_ldap_get_values_len(HPHP::Object const&, HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP21f_ldap_get_values_lenERKNS_6ObjectES2_RKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-attribute => rcx
-*/
-
 TypedValue* fh_ldap_get_values_len(TypedValue* _rv, Value* link, Value* result_entry, Value* attribute) asm("_ZN4HPHP21f_ldap_get_values_lenERKNS_6ObjectES2_RKNS_6StringE");
 
-/*
-HPHP::Variant HPHP::f_ldap_get_values(HPHP::Object const&, HPHP::Object const&, HPHP::String const&)
-_ZN4HPHP17f_ldap_get_valuesERKNS_6ObjectES2_RKNS_6StringE
-
-(return value) => rax
-_rv => rdi
-link => rsi
-result_entry => rdx
-attribute => rcx
-*/
-
 TypedValue* fh_ldap_get_values(TypedValue* _rv, Value* link, Value* result_entry, Value* attribute) asm("_ZN4HPHP17f_ldap_get_valuesERKNS_6ObjectES2_RKNS_6StringE");
 
-
-} // !HPHP
-
+} // namespace HPHP