Return false from GenInlined** for intrinsics that we don't implement.
We will generate incorrect code otherwise.
Change-Id: I1949c9ecb06ec5aa0f1ac6680f5df31ecd1a1945
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index e917050..82adef9 100755
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1230,13 +1230,13 @@
bool Mir2Lir::GenInlinedCharAt(CallInfo* info) {
// Temporary disabled intrinsic.
- return true;
+ return false;
}
// Generates an inlined String.is_empty or String.length.
bool Mir2Lir::GenInlinedStringIsEmptyOrLength(CallInfo* info, bool is_empty) {
// Temporary disabled intrinsic.
- return true;
+ return false;
}
bool Mir2Lir::GenInlinedReverseBytes(CallInfo* info, OpSize size) {
diff --git a/compiler/dex/quick/x86/target_x86.cc b/compiler/dex/quick/x86/target_x86.cc
index 31b068d..5934db2 100755
--- a/compiler/dex/quick/x86/target_x86.cc
+++ b/compiler/dex/quick/x86/target_x86.cc
@@ -1238,8 +1238,8 @@
* otherwise bails to standard library code.
*/
bool X86Mir2Lir::GenInlinedIndexOf(CallInfo* info, bool zero_based) {
- // Temporarily disabled intrinsic.
- return true;
+ // Temporarily disabled intrinsic.
+ return false;
}
/*
@@ -2630,7 +2630,7 @@
bool X86Mir2Lir::GenInlinedCharAt(CallInfo* info) {
// Temporarily disabled intrinsic.
- return true;
+ return false;
}
bool X86Mir2Lir::GenInlinedCurrentThread(CallInfo* info) {
