Revert "[vm/ffi] SimDBC on Arm64 Android"

This reverts commit 9e3b44b. Reason for revert: Breaks the Mac iOS Flutter Engine build ../../third_party/dart/runtime/vm/compiler/ffi_dbc_trampoline_arm64.S:5:1: error: unknown directive .type FfiTrampolineCall, %function Original change's description: > [vm/ffi] SimDBC on Arm64 Android > > Bug: dart-lang#35773 > > Change-Id: I6f1f85239b0ffe5c310b9aeea4a4edcd97362bca > Cq-Include-Trybots: luci.dart.try:vm-ffi-android-debug-arm-try, app-kernel-linux-debug-x64-try, vm-kernel-linux-debug-simdbc64-try,vm-kernel-mac-debug-simdbc64-try,vm-kernel-reload-mac-debug-simdbc64-try,vm-kernel-linux-debug-ia32-try,vm-dartkb-linux-debug-simarm64-try > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104565 > Reviewed-by: Samir Jindel <[email protected]> > Commit-Queue: Samir Jindel <[email protected]> > Commit-Queue: Daco Harkes <[email protected]> [email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Bug: dart-lang#35773 Change-Id: Ibc968bb2077f66da70a0034b45908e8d24e822f2 Cq-Include-Trybots: luci.dart.try:vm-ffi-android-debug-arm-try, app-kernel-linux-debug-x64-try, vm-kernel-linux-debug-simdbc64-try, vm-kernel-mac-debug-simdbc64-try, vm-kernel-reload-mac-debug-simdbc64-try, vm-kernel-linux-debug-ia32-try, vm-dartkb-linux-debug-simarm64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107700 Reviewed-by: Siva Annamalai <[email protected]> Commit-Queue: Siva Annamalai <[email protected]>
tangaowei · Jun 28, 2019 · 0abff7b · 0abff7b
1 parent 55370b8
commit 0abff7b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 77 deletions.
diff --git a/runtime/vm/compiler/compiler_sources.gni b/runtime/vm/compiler/compiler_sources.gni
@@ -152,12 +152,9 @@ compiler_sources = [
 #
 # Not that this diverges from our convention to build every file on every OS
 # but have ifdef guards which make the files empty on some configurations.
-if (!is_win) {
+if (is_linux || is_mac) {
   # MASM on Windows does not support c preproccesor style flags.
-  compiler_sources += [
-    "ffi_dbc_trampoline_arm64.S",
-    "ffi_dbc_trampoline_x64_linux_mac.S",
-  ]
+  compiler_sources += [ "ffi_dbc_trampoline_x64_linux_mac.S" ]
 }
 
 compiler_sources_tests = [

diff --git a/runtime/vm/compiler/ffi_dbc_trampoline.h b/runtime/vm/compiler/ffi_dbc_trampoline.h
@@ -9,8 +9,7 @@
 
 namespace dart {
 
-#if !defined(HOST_OS_WINDOWS) &&                                               \
-    (defined(HOST_ARCH_X64) || defined(HOST_ARCH_ARM64))
+#if defined(HOST_ARCH_X64) && !defined(HOST_OS_WINDOWS)
 
 // Generic Trampoline for DBC dart:ffi calls. Argument needs to be layed out as
 // a FfiMarshalledArguments.

diff --git a/runtime/vm/compiler/ffi_dbc_trampoline_arm64.S b/runtime/vm/compiler/ffi_dbc_trampoline_arm64.S
diff --git a/runtime/vm/dart_api_impl.h b/runtime/vm/dart_api_impl.h
@@ -300,9 +300,8 @@ class Api : AllStatic {
 #if defined(TARGET_ARCH_DBC) && !defined(ARCH_IS_64_BIT)
     // TODO(36809): Support SimDBC32.
     return false;
-#elif defined(TARGET_ARCH_DBC) &&                                              \
-    !(defined(HOST_ARCH_X64) || defined(HOST_ARCH_ARM64))
-    // TODO(36809): Support ia32 and arm.
+#elif defined(TARGET_ARCH_DBC) && !defined(HOST_ARCH_X64)
+    // TODO(35773): Support ia32, arm64, and arm.
     return false;
 #elif defined(TARGET_ARCH_DBC) && defined(HOST_ARCH_X64) &&                    \
     defined(HOST_OS_WINDOWS)

diff --git a/tests/ffi/ffi.status b/tests/ffi/ffi.status
@@ -24,7 +24,7 @@ function_callbacks_test/03: Skip
 [ $arch == arm && $system != android ]
 *: Skip # "hardfp" calling convention is not yet supported (iOS is also supported but not tested): dartbug.com/36309
 
-[ $arch == simdbc64 && $system != android && $system != linux && $system != macos ]
+[ $arch == simdbc64 && $system != linux && $system != macos ]
 *: Skip # FFI not yet supported outside x64 Linux: dartbug.com/36809
 
 [ $runtime != dart_precompiled && $runtime != vm ]