Merge pull request #301 from szenker/fix-core-dump-in-GetFunctorStartAddress

Fixed access violation in GetFunctorStartAddress()

c++/src/kj/async-inl.h

@@ -285,9 +285,14 @@ class PtmfHelper {
 #undef BODY
 
   void* apply(void* obj) {
+#if defined(__arm__) || defined(__mips__) || defined(__aarch64__)
+    if (adj & 1) {
+      ptrdiff_t voff = (ptrdiff_t)ptr;
+#else
     ptrdiff_t voff = (ptrdiff_t)ptr;
     if (voff & 1) {
       voff &= ~1;
+#endif
       return *(void**)(*(char**)obj + voff);
     } else {
       return ptr;

c++/src/kj/async-test.c++

@@ -26,6 +26,10 @@
 namespace kj {
 namespace {
 
+TEST(Async, GetFunctorStartAddress) {
+  EXPECT_TRUE(nullptr != _::GetFunctorStartAddress<>::apply([](){return 0;}));
+}
+
 TEST(Async, EvalVoid) {
   EventLoop loop;
   WaitScope waitScope(loop);