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

a-siva · a-siva · commit b5aeaa67960c · 2019-07-04T00:57:23.000Z
This reverts commit a515a0c. Reason for revert: There are still issues here, the flutter engine build for ios_debug again fails with this error: ld: warning: arm64 function not 4-byte aligned: FfiTrampolineCall from obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi_dbc_trampoline_arm64.o ld: warning: arm64 function not 4-byte aligned: .loop from obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi_dbc_trampoline_arm64.o ld: warning: arm64 function not 4-byte aligned: .done from obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi_dbc_trampoline_arm64.o Undefined symbols for architecture arm64: "_FfiTrampolineCall", referenced from: dart::Simulator::Call(dart::Code const&, dart::Array const&, dart::Array const&, dart::Thread*) in libdart_vm_jit.simulator_dbc.o ld: symbol(s) not found for architecture arm64 Original change's description: > Reland "[vm/ffi] SimDBC on Arm64 Android" > > This reverts commit 0abff7b and fixes the assembly file. > > Change-Id: Ibef58c932c843aebb4de227ac5fc7664d463173f > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107746 > Auto-Submit: Daco Harkes <dacoharkes@google.com> > Reviewed-by: Samir Jindel <sjindel@google.com> > Commit-Queue: Daco Harkes <dacoharkes@google.com> TBR=sjindel@google.com,asiva@google.com,dacoharkes@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Ia5fd52180f7d9dfce588db361ce17dfb6f05254d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108206 Reviewed-by: Siva Annamalai <asiva@google.com>
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 ]

Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,9 @@ compiler_sources = [`
`152`	`152`	`#`
`153`	`153`	`# Not that this diverges from our convention to build every file on every OS`
`154`	`154`	`# but have ifdef guards which make the files empty on some configurations.`
`155`		`-if (!is_win) {`
	`155`	`+if (is_linux \|\| is_mac) {`
`156`	`156`	`# MASM on Windows does not support c preproccesor style flags.`
`157`		`- compiler_sources += [`
`158`		`- "ffi_dbc_trampoline_arm64.S",`
`159`		`- "ffi_dbc_trampoline_x64_linux_mac.S",`
`160`		`- ]`
	`157`	`+ compiler_sources += [ "ffi_dbc_trampoline_x64_linux_mac.S" ]`
`161`	`158`	`}`
`162`	`159`
`163`	`160`	`compiler_sources_tests = [`