summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter_common.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2023-07-13 13:43:12 +0000
committer VladimĂ­r Marko <vmarko@google.com> 2023-07-14 08:45:01 +0000
commit028fb48ae2bddeef20b91e4a1582ce58df724741 (patch)
tree412a498c59cea952598261fa1f76c0b429655c51 /runtime/interpreter/interpreter_common.cc
parent53472ff9f59c6e6d1494fe767b9137794b8d5f0f (diff)
Clean up ART intrinsics.
Change `intrinsics_list.h` to a normal include file instead of the weird include-use-and-undef pattern. Prefix macros defined in that file with `ART_`. And also remove blank lines at end of some files and address some comments on merged changes. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 283082089 Change-Id: I9c462f973c0c4bb53eff39fbe191014f6321d7c5
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
-rw-r--r--runtime/interpreter/interpreter_common.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index ac9980f6d3..491f05fffd 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -26,6 +26,7 @@
#include "entrypoints/runtime_asm_entrypoints.h"
#include "handle.h"
#include "intrinsics_enum.h"
+#include "intrinsics_list.h"
#include "jit/jit.h"
#include "jvalue-inl.h"
#include "method_handles-inl.h"
@@ -555,10 +556,7 @@ bool DoInvokePolymorphic(Thread* self,
#define CASE_SIGNATURE_POLYMORPHIC_INTRINSIC(Name, ...) \
case Intrinsics::k##Name: \
return Do ## Name(self, shadow_frame, inst, inst_data, result);
-#include "intrinsics_list.h"
- SIGNATURE_POLYMORPHIC_INTRINSICS_LIST(CASE_SIGNATURE_POLYMORPHIC_INTRINSIC)
-#undef INTRINSICS_LIST
-#undef SIGNATURE_POLYMORPHIC_INTRINSICS_LIST
+ ART_SIGNATURE_POLYMORPHIC_INTRINSICS_LIST(CASE_SIGNATURE_POLYMORPHIC_INTRINSIC)
#undef CASE_SIGNATURE_POLYMORPHIC_INTRINSIC
default:
LOG(FATAL) << "Unreachable: " << invoke_method->GetIntrinsic();