Revert "Update hidden API membership of intrinsics"
This reverts commit e1954f30cbf70ed4430b9ca7b85b5d52fdc42251.
Reason for revert: Breaks all internal tests.
Bug: 64382372
Bug: 77733081
Bug: 72430785
Change-Id: If6138ee1a3d73059b20c582c0dfd388ff07507a2
diff --git a/runtime/compiler_callbacks.h b/runtime/compiler_callbacks.h
index 279d5ab..6855dcd 100644
--- a/runtime/compiler_callbacks.h
+++ b/runtime/compiler_callbacks.h
@@ -42,7 +42,6 @@
public:
enum class CallbackMode { // private
kCompileBootImage,
- kCompileCoreImage,
kCompileApp
};
@@ -68,15 +67,8 @@
virtual void SetDoesClassUnloading(bool does_class_unloading ATTRIBUTE_UNUSED,
CompilerDriver* compiler_driver ATTRIBUTE_UNUSED) {}
- // Returns true if the compiler is compiling a boot image.
- // Note that core image (a minimal boot image for testing) is also considered a boot image.
bool IsBootImage() {
- return mode_ == CallbackMode::kCompileBootImage || mode_ == CallbackMode::kCompileCoreImage;
- }
-
- // Returns true if the compiler is compiling a core image (a minimal boot image for testing).
- bool IsCoreImage() {
- return mode_ == CallbackMode::kCompileCoreImage;
+ return mode_ == CallbackMode::kCompileBootImage;
}
virtual void UpdateClassState(ClassReference ref ATTRIBUTE_UNUSED,