commit a07de551da5147f3635c665a31f262cf65647118
author Artem Serov <artem.serov@linaro.org> Sun Nov 01 22:42:43 2020 +0000
committer Ulyana Trafimovich <skvadrik@google.com> Mon Nov 16 14:31:54 2020 +0000
tree d6f8199cc45ab8b6ef779f97ef0e8f0d04520ef8
parent 4483d2a4ed7e6c018e304c234484940ec0476039

Revert^2 "ART: Fix breaking changes from recent VIXL update."

This reverts commit eeaf47f7c9bbad29afab84a0f199a5751d9c616b.

Also fixes the gtest failure when VIXL simulator stack
was overflown.

Test: test-art-target, test-art-host.
Test: ART_USE_READ_BARRIER=false \
      SANITIZE_HOST=address \
      ASAN_OPTIONS='detect_leaks=0' \
      SOONG_ALLOW_MISSING_DEPENDENCIES=true \
      ART_HEAP_POISONING=true m test-art-host-gtest

Change-Id: Ibc1f21204940083879f767d6993127bdde8326af

compiler/optimizing/nodes_shared.cc

diff --git a/compiler/optimizing/nodes_shared.cc b/compiler/optimizing/nodes_shared.cc
index 2f971b9..eca97d7 100644
--- a/compiler/optimizing/nodes_shared.cc
+++ b/compiler/optimizing/nodes_shared.cc
@@ -21,7 +21,7 @@
 
 #include "nodes_shared.h"
 
-#include "common_arm64.h"
+#include "instruction_simplifier_shared.h"
 
 namespace art {